@codingame/monaco-vscode-api 20.5.0 → 21.0.1

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

@@ -1,3 +1,4 @@
+import { IAction } from "../../../../base/common/actions.js";
 import { DeferredPromise } from "../../../../base/common/async.js";
 import { Event } from "../../../../base/common/event.js";
 import { IMarkdownString } from "../../../../base/common/htmlContent.js";
@@ -9,14 +10,14 @@ import { ISelection } from "../../../../editor/common/core/selection.js";
 import { Command, Location, TextEdit } from "../../../../editor/common/languages.js";
 import { FileType } from "../../../../platform/files/common/files.js";
 import { ICellEditOperation } from "../../notebook/common/notebookCommon.js";
-import { IWorkspaceSymbol } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search";
-import { IChatAgentCommand, IChatAgentData, IChatAgentResult } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IWorkspaceSymbol } from "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common/vscode/vs/workbench/contrib/search/common/search";
+import { IChatAgentCommand, IChatAgentData, IChatAgentResult, UserSelectedTools } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatRequestModeInfo, IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatParserContext } from "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser";
 import { IChatRequestVariableEntry } from "./chatVariableEntries.js";
 import { IChatRequestVariableValue } from "./chatVariables.js";
 import { ChatAgentLocation, ChatModeKind } from "./constants.js";
-import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult, IToolResultInputOutputDetails } from "./languageModelToolsService.js";
+import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult, IToolResultInputOutputDetails, ToolDataSource } from "./languageModelToolsService.js";
 export interface IChatRequest {
     message: string;
     variables: Record<string, IChatRequestVariableValue[]>;
@@ -39,6 +40,7 @@ export interface IChatResponseErrorDetails {
     isQuotaExceeded?: boolean;
     level?: ChatErrorLevel;
     confirmationButtons?: IChatResponseErrorDetailsConfirmationButton[];
+    code?: string;
 }
 export interface IChatResponseProgressFileTreeData {
     label: string;
@@ -82,6 +84,10 @@ export interface IChatContentReference {
             description: string;
             kind: ChatResponseReferencePartStatusKind;
         };
+        diffMeta?: {
+            added: number;
+            removed: number;
+        };
     };
     kind: "reference";
 }
@@ -119,6 +125,8 @@ export interface IChatMultiDiffData {
             originalUri?: URI;
             modifiedUri?: URI;
             goToFileUri?: URI;
+            added?: number;
+            removed?: number;
         }>;
     };
     kind: "multiDiffData";
@@ -210,12 +218,22 @@ export interface IChatElicitationRequest {
     message: string | IMarkdownString;
     acceptButtonLabel: string;
     rejectButtonLabel: string;
-    originMessage?: string | IMarkdownString;
+    subtitle?: string | IMarkdownString;
+    source?: ToolDataSource;
     state: "pending" | "accepted" | "rejected";
     acceptedResult?: Record<string, unknown>;
-    accept(): Promise<void>;
+    moreActions?: IAction[];
+    accept(value: IAction | true): Promise<void>;
     reject(): Promise<void>;
-    onDidRequestHide: Event<void>;
+    onDidRequestHide?: Event<void>;
+}
+export interface IChatThinkingPart {
+    kind: "thinking";
+    value?: string | string[];
+    id?: string;
+    metadata?: {
+        readonly [key: string]: any;
+    };
 }
 export interface IChatTerminalToolInvocationData {
     kind: "terminal";
@@ -224,7 +242,11 @@ export interface IChatTerminalToolInvocationData {
         userEdited?: string;
         toolEdited?: string;
     };
+    /** Message for model recommending the use of an alternative tool */
+    alternativeRecommendation?: string;
     language: string;
+    terminalToolSessionId?: string;
+    autoApproveInfo?: IMarkdownString;
 }
 /**
  * @deprecated This is the old API shape, we should support this for a while before removing it so
@@ -239,18 +261,42 @@ export interface IChatToolInputInvocationData {
     kind: "input";
     rawInput: any;
 }
+export declare enum ToolConfirmKind {
+    Denied = 0,
+    ConfirmationNotNeeded = 1,
+    Setting = 2,
+    LmServicePerTool = 3,
+    UserAction = 4,
+    Skipped = 5
+}
+export type ConfirmedReason = {
+    type: ToolConfirmKind.Denied;
+} | {
+    type: ToolConfirmKind.ConfirmationNotNeeded;
+} | {
+    type: ToolConfirmKind.Setting;
+    id: string;
+} | {
+    type: ToolConfirmKind.LmServicePerTool;
+    scope: "session" | "workspace" | "profile";
+} | {
+    type: ToolConfirmKind.UserAction;
+} | {
+    type: ToolConfirmKind.Skipped;
+};
 export interface IChatToolInvocation {
     presentation: IPreparedToolInvocation["presentation"];
     toolSpecificData?: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent;
     /** Presence of this property says that confirmation is required */
     confirmationMessages?: IToolConfirmationMessages;
-    confirmed: DeferredPromise<boolean>;
-    /** A 3-way: undefined=don't know yet. */
-    isConfirmed: boolean | undefined;
+    confirmed: DeferredPromise<ConfirmedReason>;
+    /** undefined=don't know yet. */
+    isConfirmed: ConfirmedReason | undefined;
     originMessage: string | IMarkdownString | undefined;
     invocationMessage: string | IMarkdownString;
     pastTenseMessage: string | IMarkdownString | undefined;
     resultDetails: IToolResult["toolResultDetails"];
+    source: ToolDataSource;
     progress: IObservable<{
         message?: string | IMarkdownString;
         progress: number;
@@ -279,10 +325,12 @@ export interface IChatToolInvocationSerialized {
     originMessage: string | IMarkdownString | undefined;
     pastTenseMessage: string | IMarkdownString | undefined;
     resultDetails?: Array<URI | Location> | IToolResultInputOutputDetails | IToolResultOutputDetailsSerialized;
-    isConfirmed: boolean | undefined;
+    /** boolean used by pre-1.104 versions */
+    isConfirmed: ConfirmedReason | boolean | undefined;
     isComplete: boolean;
     toolCallId: string;
     toolId: string;
+    source: ToolDataSource;
     kind: "toolInvocationSerialized";
 }
 export interface IChatExtensionsContent {
@@ -311,7 +359,7 @@ export interface IChatPrepareToolInvocationPart {
     readonly kind: "prepareToolInvocation";
     readonly toolName: string;
 }
-export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatMultiDiffData | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatTextEdit | IChatNotebookEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatClearToPreviousToolInvocation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatPullRequestContent | IChatUndoStop | IChatPrepareToolInvocationPart | IChatTaskSerialized | IChatElicitationRequest;
+export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatMultiDiffData | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatTextEdit | IChatNotebookEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatClearToPreviousToolInvocation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatPullRequestContent | IChatUndoStop | IChatPrepareToolInvocationPart | IChatThinkingPart | IChatTaskSerialized | IChatElicitationRequest;
 export interface IChatFollowup {
     kind: "reply";
     message: string;
@@ -406,8 +454,13 @@ export interface IChatEditingHunkAction {
     kind: "chatEditingHunkAction";
     uri: URI;
     lineCount: number;
+    linesAdded: number;
+    linesRemoved: number;
     outcome: "accepted" | "rejected";
     hasRemainingEdits: boolean;
+    modeId?: string;
+    modelId?: string;
+    languageId?: string;
 }
 export type ChatUserAction = IChatVoteAction | IChatCopyAction | IChatInsertAction | IChatApplyAction | IChatTerminalAction | IChatCommandAction | IChatFollowupAction | IChatBugReportAction | IChatInlineChatCodeAction | IChatEditingSessionAction | IChatEditingHunkAction;
 export interface IChatUserActionEvent {
@@ -417,6 +470,8 @@ export interface IChatUserActionEvent {
     sessionId: string;
     requestId: string;
     result: IChatAgentResult | undefined;
+    modelId?: string | undefined;
+    modeId?: string | undefined;
 }
 export interface IChatDynamicRequest {
     /**
@@ -471,10 +526,9 @@ export interface IChatTerminalLocationData {
 }
 export type IChatLocationData = IChatEditorLocationData | IChatNotebookLocationData | IChatTerminalLocationData;
 export interface IChatSendRequestOptions {
-    mode?: ChatModeKind;
+    modeInfo?: IChatRequestModeInfo;
     userSelectedModelId?: string;
-    userSelectedTools?: IObservable<Record<string, boolean>>;
-    modeInstructions?: string;
+    userSelectedTools?: IObservable<UserSelectedTools>;
     location?: ChatAgentLocation;
     locationData?: IChatLocationData;
     parserContext?: IChatParserContext;
@@ -485,6 +539,8 @@ export interface IChatSendRequestOptions {
     attachedContext?: IChatRequestVariableEntry[];
     /** 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 */
+    agentIdSilent?: string;
     slashCommand?: string;
     /**
      * The label of the confirmation action that was selected.

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

@@ -34,6 +34,15 @@ var ChatResponseClearToPreviousToolInvocationReason;
     ChatResponseClearToPreviousToolInvocationReason[ChatResponseClearToPreviousToolInvocationReason["FilteredContentRetry"] = 1] = "FilteredContentRetry";
     ChatResponseClearToPreviousToolInvocationReason[ChatResponseClearToPreviousToolInvocationReason["CopyrightContentRetry"] = 2] = "CopyrightContentRetry";
 })(ChatResponseClearToPreviousToolInvocationReason || (ChatResponseClearToPreviousToolInvocationReason = {}));
+var ToolConfirmKind;
+(function (ToolConfirmKind) {
+    ToolConfirmKind[ToolConfirmKind["Denied"] = 0] = "Denied";
+    ToolConfirmKind[ToolConfirmKind["ConfirmationNotNeeded"] = 1] = "ConfirmationNotNeeded";
+    ToolConfirmKind[ToolConfirmKind["Setting"] = 2] = "Setting";
+    ToolConfirmKind[ToolConfirmKind["LmServicePerTool"] = 3] = "LmServicePerTool";
+    ToolConfirmKind[ToolConfirmKind["UserAction"] = 4] = "UserAction";
+    ToolConfirmKind[ToolConfirmKind["Skipped"] = 5] = "Skipped";
+})(ToolConfirmKind || (ToolConfirmKind = {}));
 var ChatAgentVoteDirection;
 (function (ChatAgentVoteDirection) {
     ChatAgentVoteDirection[ChatAgentVoteDirection["Down"] = 0] = "Down";
@@ -57,4 +66,4 @@ var ChatCopyKind;
     ChatCopyKind[ChatCopyKind["Toolbar"] = 2] = "Toolbar";
 })(ChatCopyKind || (ChatCopyKind = {}));
 
-export { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatCopyKind, ChatErrorLevel, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, isIDocumentContext, isIUsedContext };
+export { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatCopyKind, ChatErrorLevel, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, ToolConfirmKind, isIDocumentContext, isIUsedContext };

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

@@ -15,9 +15,10 @@ export interface IChatService {
     }>;
     isEnabled(location: ChatAgentLocation): boolean;
     hasSessions(): boolean;
-    startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean): ChatModel;
+    startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean, inputType?: string): ChatModel;
     getSession(sessionId: string): IChatModel | undefined;
     getOrRestoreSession(sessionId: string): Promise<IChatModel | undefined>;
+    getPersistedSessionTitle(sessionId: string): string | undefined;
     isPersistedSessionEmpty(sessionId: string): boolean;
     loadSessionFromContent(data: IExportableChatData | ISerializableChatData | URI): IChatModel | undefined;
     loadSessionForResource(resource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined>;

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

@@ -1,48 +1,75 @@
-import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
-import { URI } from "../../../../base/common/uri.js";
+import { IMarkdownString } from "../../../../base/common/htmlContent.js";
+import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { IObservable } from "../../../../base/common/observable.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
-import { IChatProgress } from "./chatService.js";
-import { IChatAgentRequest } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IRelaxedExtensionDescription } from "../../../../platform/extensions/common/extensions.js";
+import { IChatAgentRequest } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatProgress } from "./chatService.js";
+export declare enum ChatSessionStatus {
+    Failed = 0,
+    Completed = 1,
+    InProgress = 2
+}
 export interface IChatSessionsExtensionPoint {
-    readonly id: string;
     readonly type: string;
     readonly name: string;
     readonly displayName: string;
     readonly description: string;
     readonly extensionDescription: IRelaxedExtensionDescription;
     readonly when?: string;
+    readonly capabilities?: {
+        supportsFileAttachments?: boolean;
+        supportsToolAttachments?: boolean;
+    };
 }
 export interface IChatSessionItem {
     id: string;
     label: string;
-    iconPath?: URI | {
-        light: URI;
-        dark: URI;
-    } | ThemeIcon;
+    iconPath?: ThemeIcon;
+    description?: string | IMarkdownString;
+    status?: ChatSessionStatus;
+    tooltip?: string | IMarkdownString;
+    timing?: {
+        startTime: number;
+        endTime?: number;
+    };
+    statistics?: {
+        insertions: number;
+        deletions: number;
+    };
 }
+export type IChatSessionHistoryItem = {
+    type: "request";
+    prompt: string;
+    participant: string;
+} | {
+    type: "response";
+    parts: IChatProgress[];
+    participant: string;
+};
 export interface ChatSession extends IDisposable {
-    readonly id: string;
+    readonly sessionId: string;
     readonly onWillDispose: Event<void>;
-    history: Array<{
-        type: "request";
-        prompt: string;
-    } | {
-        type: "response";
-        parts: IChatProgress[];
-    }>;
-    readonly progressEvent?: Event<IChatProgress[]>;
+    history: Array<IChatSessionHistoryItem>;
+    readonly progressObs?: IObservable<IChatProgress[]>;
+    readonly isCompleteObs?: IObservable<boolean>;
     readonly interruptActiveResponseCallback?: () => Promise<boolean>;
-    requestHandler?: (request: IChatAgentRequest, progress: (progress: IChatProgress[]) => void, history: [
-    ], token: CancellationToken) => Promise<void>;
+    requestHandler?: (request: IChatAgentRequest, progress: (progress: IChatProgress[]) => void, history: any[], // TODO: Nail down types
+    token: CancellationToken) => Promise<void>;
 }
 export interface IChatSessionItemProvider {
     readonly chatSessionType: string;
+    readonly onDidChangeChatSessionItems: Event<void>;
     provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]>;
+    provideNewChatSessionItem?(options: {
+        request: IChatAgentRequest;
+        prompt?: string;
+        history?: any[];
+        metadata?: any;
+    }, token: CancellationToken): Promise<IChatSessionItem>;
 }
 export interface IChatSessionContentProvider {
-    readonly chatSessionType: string;
-    provideChatSessionContent(id: string, token: CancellationToken): Promise<ChatSession>;
+    provideChatSessionContent(sessionId: string, token: CancellationToken): Promise<ChatSession>;
 }

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

@@ -0,0 +1,10 @@
+
+
+var ChatSessionStatus;
+(function (ChatSessionStatus) {
+    ChatSessionStatus[ChatSessionStatus["Failed"] = 0] = "Failed";
+    ChatSessionStatus[ChatSessionStatus["Completed"] = 1] = "Completed";
+    ChatSessionStatus[ChatSessionStatus["InProgress"] = 2] = "InProgress";
+})(ChatSessionStatus || (ChatSessionStatus = {}));
+
+export { ChatSessionStatus };

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

@@ -1,22 +1,37 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { IChatSessionItemProvider, IChatSessionsExtensionPoint, IChatSessionContentProvider, IChatSessionItem, ChatSession } from "./chatSessionsService.js";
+import { IEditableData } from "../../../common/views.js";
+import { IChatAgentRequest } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatSessionItemProvider, IChatSessionsExtensionPoint, IChatSessionItem, IChatSessionContentProvider, ChatSession } from "./chatSessionsService.js";
 export interface IChatSessionsService {
     readonly _serviceBrand: undefined;
     readonly onDidChangeItemsProviders: Event<IChatSessionItemProvider>;
     readonly onDidChangeSessionItems: Event<string>;
     readonly onDidChangeAvailability: Event<void>;
-    registerContribution(contribution: IChatSessionsExtensionPoint): IDisposable;
-    getChatSessionContributions(): IChatSessionsExtensionPoint[];
-    canResolveItemProvider(chatSessionType: string): Promise<boolean>;
-    canResolveContentProvider(chatSessionType: string): Promise<boolean>;
-    getChatSessionItemProviders(): IChatSessionItemProvider[];
+    readonly onDidChangeInProgress: Event<void>;
     registerChatSessionItemProvider(provider: IChatSessionItemProvider): IDisposable;
-    registerChatSessionContentProvider(provider: IChatSessionContentProvider): IDisposable;
-    hasChatSessionItemProviders: boolean;
+    getAllChatSessionContributions(): IChatSessionsExtensionPoint[];
+    canResolveItemProvider(chatSessionType: string): Promise<boolean>;
+    getAllChatSessionItemProviders(): IChatSessionItemProvider[];
+    provideNewChatSessionItem(chatSessionType: string, options: {
+        request: IChatAgentRequest;
+        prompt?: string;
+        history?: any[];
+        metadata?: any;
+    }, token: CancellationToken): Promise<IChatSessionItem>;
     provideChatSessionItems(chatSessionType: string, token: CancellationToken): Promise<IChatSessionItem[]>;
-    notifySessionItemsChange(chatSessionType: string): void;
+    reportInProgress(chatSessionType: string, count: number): void;
+    getInProgress(): {
+        displayName: string;
+        count: number;
+    }[];
+    registerChatSessionContentProvider(chatSessionType: string, provider: IChatSessionContentProvider): IDisposable;
+    canResolveContentProvider(chatSessionType: string): Promise<boolean>;
     provideChatSessionContent(chatSessionType: string, id: string, token: CancellationToken): Promise<ChatSession>;
+    setEditableSession(sessionId: string, data: IEditableData | null): Promise<void>;
+    getEditableData(sessionId: string): IEditableData | undefined;
+    isEditable(sessionId: string): boolean;
+    notifySessionItemsChanged(chatSessionType: string): void;
 }
 export declare const IChatSessionsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatSessionsService>;

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

@@ -1,6 +1,7 @@
-import { IChatTodoListStorage } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/chatTodoListService";
+import { IChatTodo } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/chatTodoListService";
 export declare const IChatTodoListService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatTodoListService>;
 export interface IChatTodoListService {
     readonly _serviceBrand: undefined;
-    getChatTodoListStorage(): IChatTodoListStorage;
+    getTodos(sessionId: string): IChatTodo[];
+    setTodos(sessionId: string, todos: IChatTodo[]): void;
 }

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

@@ -155,7 +155,7 @@ export declare enum PromptFileVariableKind {
  * @param kind The kind of the prompt file variable entry.
  */
 export declare function toPromptFileVariableEntry(uri: URI, kind: PromptFileVariableKind, originLabel?: string, automaticallyAdded?: boolean): IPromptFileVariableEntry;
-export declare function toPromptTextVariableEntry(content: string, settingId?: string, automaticallyAdded?: boolean): IPromptTextVariableEntry;
+export declare function toPromptTextVariableEntry(content: string, automaticallyAdded?: boolean): IPromptTextVariableEntry;
 export declare function toFileVariableEntry(uri: URI, range?: IRange): IChatRequestFileEntry;
 export declare class ChatRequestVariableSet {
     private _ids;
@@ -166,5 +166,6 @@ export declare class ChatRequestVariableSet {
     remove(entry: IChatRequestVariableEntry): void;
     has(entry: IChatRequestVariableEntry): boolean;
     asArray(): IChatRequestVariableEntry[];
+    get length(): number;
 }
 export {};

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

@@ -54,9 +54,9 @@ var IDiagnosticVariableEntryFilterData;
             }
             return data.problemMessage.substring(0, lastSpace) + '…';
         }
-        let labelStr = ( localize(5420, "All Problems"));
+        let labelStr = ( localize(5547, "All Problems"));
         if (data.filterUri) {
-            labelStr = ( localize(5421, "Problems in {0}", basename(data.filterUri)));
+            labelStr = ( localize(5548, "Problems in {0}", basename(data.filterUri)));
         }
         return labelStr;
     }
@@ -85,6 +85,9 @@ function isNotebookOutputVariableEntry(obj) {
 function isElementVariableEntry(obj) {
     return obj.kind === 'element';
 }
+function isChatRequestFileEntry(obj) {
+    return obj.kind === 'file';
+}
 function isPromptFileVariableEntry(obj) {
     return obj.kind === 'promptFile';
 }
@@ -112,14 +115,13 @@ function toPromptFileVariableEntry(uri, kind, originLabel, automaticallyAdded =
         automaticallyAdded
     };
 }
-function toPromptTextVariableEntry(content, settingId, automaticallyAdded = false) {
+function toPromptTextVariableEntry(content, automaticallyAdded = false) {
     return {
-        id: `vscode.prompt.instructions.text${settingId ? `.${settingId}` : ''}`,
-        name: `prompt:text`,
+        id: `vscode.prompt.instructions.text`,
+        name: `prompt:instructionsList`,
         value: content,
-        settingId,
         kind: 'promptText',
-        modelDescription: 'Prompt instructions text',
+        modelDescription: 'Prompt instructions list',
         automaticallyAdded
     };
 }
@@ -155,6 +157,9 @@ class ChatRequestVariableSet {
     asArray() {
         return this._entries.slice(0);
     }
+    get length() {
+        return this._entries.length;
+    }
 }
 
-export { ChatRequestVariableSet, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData, OmittedState, PromptFileVariableKind, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemVariableEntry, toPromptFileVariableEntry, toPromptTextVariableEntry };
+export { ChatRequestVariableSet, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData, OmittedState, PromptFileVariableKind, isChatRequestFileEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemVariableEntry, toPromptFileVariableEntry, toPromptTextVariableEntry };

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

@@ -1,9 +1,8 @@
 import { IDynamicVariable } from "./chatVariables.js";
-import { IToolData, ToolSet } from "./languageModelToolsService.js";
+import { IToolAndToolSetEnablementMap } from "./languageModelToolsService.js";
 export declare const IChatVariablesService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatVariablesService>;
 export interface IChatVariablesService {
     _serviceBrand: undefined;
     getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>;
-    getSelectedTools(sessionId: string): ReadonlyArray<IToolData>;
-    getSelectedToolSets(sessionId: string): ReadonlyArray<ToolSet>;
+    getSelectedToolAndToolSets(sessionId: string): IToolAndToolSetEnablementMap;
 }

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

@@ -4,9 +4,15 @@ export declare enum ChatConfiguration {
     Edits2Enabled = "chat.edits2.enabled",
     ExtensionToolsEnabled = "chat.extensionTools.enabled",
     EditRequests = "chat.editRequests",
+    GlobalAutoApprove = "chat.tools.global.autoApprove",
+    AutoApproveEdits = "chat.tools.edits.autoApprove",
     EnableMath = "chat.math.enabled",
     CheckpointsEnabled = "chat.checkpoints.enabled",
-    AgentSessionsViewLocation = "chat.agentSessionsViewLocation"
+    AgentSessionsViewLocation = "chat.agentSessionsViewLocation",
+    ThinkingStyle = "chat.agent.thinkingStyle",
+    UseChatSessionsForCloudButton = "chat.useChatSessionsForCloudButton",
+    ShowAgentSessionsViewDescription = "chat.showAgentSessionsViewDescription",
+    EmptyStateHistoryEnabled = "chat.emptyState.history.enabled"
 }
 /**
  * The "kind" of the chat mode- "Agent" for custom modes.
@@ -18,6 +24,12 @@ export declare enum ChatModeKind {
 }
 export declare function validateChatMode(mode: unknown): ChatModeKind | undefined;
 export declare function isChatMode(mode: unknown): mode is ChatModeKind;
+export declare enum ThinkingDisplayMode {
+    Collapsed = "collapsed",
+    CollapsedPreview = "collapsedPreview",
+    Expanded = "expanded",
+    None = "none"
+}
 export type RawChatParticipantLocation = "panel" | "terminal" | "notebook" | "editing-session";
 export declare enum ChatAgentLocation {
     Panel = "panel",
@@ -28,3 +40,4 @@ export declare enum ChatAgentLocation {
 export declare namespace ChatAgentLocation {
     function fromRaw(value: RawChatParticipantLocation | string): ChatAgentLocation;
 }
+export declare const ChatUnsupportedFileSchemes: Set<string>;

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

@@ -1,4 +1,5 @@
 
+import { Schemas } from '../../../../base/common/network.js';
 
 var ChatConfiguration;
 (function (ChatConfiguration) {
@@ -7,9 +8,15 @@ var ChatConfiguration;
     ChatConfiguration["Edits2Enabled"] = "chat.edits2.enabled";
     ChatConfiguration["ExtensionToolsEnabled"] = "chat.extensionTools.enabled";
     ChatConfiguration["EditRequests"] = "chat.editRequests";
+    ChatConfiguration["GlobalAutoApprove"] = "chat.tools.global.autoApprove";
+    ChatConfiguration["AutoApproveEdits"] = "chat.tools.edits.autoApprove";
     ChatConfiguration["EnableMath"] = "chat.math.enabled";
     ChatConfiguration["CheckpointsEnabled"] = "chat.checkpoints.enabled";
     ChatConfiguration["AgentSessionsViewLocation"] = "chat.agentSessionsViewLocation";
+    ChatConfiguration["ThinkingStyle"] = "chat.agent.thinkingStyle";
+    ChatConfiguration["UseChatSessionsForCloudButton"] = "chat.useChatSessionsForCloudButton";
+    ChatConfiguration["ShowAgentSessionsViewDescription"] = "chat.showAgentSessionsViewDescription";
+    ChatConfiguration["EmptyStateHistoryEnabled"] = "chat.emptyState.history.enabled";
 })(ChatConfiguration || (ChatConfiguration = {}));
 var ChatModeKind;
 (function (ChatModeKind) {
@@ -27,6 +34,13 @@ function validateChatMode(mode) {
             return undefined;
     }
 }
+var ThinkingDisplayMode;
+(function (ThinkingDisplayMode) {
+    ThinkingDisplayMode["Collapsed"] = "collapsed";
+    ThinkingDisplayMode["CollapsedPreview"] = "collapsedPreview";
+    ThinkingDisplayMode["Expanded"] = "expanded";
+    ThinkingDisplayMode["None"] = "none";
+})(ThinkingDisplayMode || (ThinkingDisplayMode = {}));
 var ChatAgentLocation;
 (function (ChatAgentLocation) {
     ChatAgentLocation["Panel"] = "panel";
@@ -46,5 +60,8 @@ var ChatAgentLocation;
     }
     ChatAgentLocation.fromRaw = fromRaw;
 })(ChatAgentLocation || (ChatAgentLocation = {}));
+const ChatUnsupportedFileSchemes = ( new Set(
+    [Schemas.vscodeChatEditor, Schemas.walkThrough, Schemas.vscodeChatSession, 'ccreq']
+));
 
-export { ChatAgentLocation, ChatConfiguration, ChatModeKind, validateChatMode };
+export { ChatAgentLocation, ChatConfiguration, ChatModeKind, ChatUnsupportedFileSchemes, ThinkingDisplayMode, validateChatMode };

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

@@ -1,17 +1,18 @@
+import { Separator } from "../../../../base/common/actions.js";
+import { VSBuffer } from "../../../../base/common/buffer.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { IMarkdownString } from "../../../../base/common/htmlContent.js";
 import { IJSONSchema } from "../../../../base/common/jsonSchema.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { IObservable, IReader, ITransaction, ObservableSet } from "../../../../base/common/observable.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { URI } from "../../../../base/common/uri.js";
 import { Location } from "../../../../editor/common/languages.js";
 import { ContextKeyExpression } from "../../../../platform/contextkey/common/contextkey.js";
 import { ExtensionIdentifier } from "../../../../platform/extensions/common/extensions.js";
 import { IProgress } from "../../../../platform/progress/common/progress.js";
-import { IChatExtensionsContent, IChatToolInputInvocationData, IChatTodoListContent, type IChatTerminalToolInvocationData } from "./chatService.js";
-import { VSBuffer } from "../../../../base/common/buffer.js";
-import { IObservable, IReader, ITransaction, ObservableSet } from "../../../../base/common/observable.js";
-import { ToolResultAudience } from "./languageModels.js";
+import { IChatExtensionsContent, IChatTodoListContent, IChatToolInputInvocationData, type IChatTerminalToolInvocationData } from "./chatService.js";
+import { LanguageModelPartAudience } from "./languageModels.js";
 export interface IToolData {
     id: string;
     source: ToolDataSource;
@@ -58,9 +59,14 @@ export type ToolDataSource = {
 } | {
     type: "internal";
     label: string;
+} | {
+    type: "external";
+    label: string;
 };
 export declare namespace ToolDataSource {
     const Internal: ToolDataSource;
+    /** External tools may not be contributed or invoked, but may be invoked externally and described in an IChatToolInvocationSerialized */
+    const External: ToolDataSource;
     function toKey(source: ToolDataSource): string;
     function equals(a: ToolDataSource, b: ToolDataSource): boolean;
     function classify(source: ToolDataSource): {
@@ -136,7 +142,7 @@ export declare function stringifyPromptTsxPart(part: IToolResultPromptTsxPart):
 export interface IToolResultTextPart {
     kind: "text";
     value: string;
-    audience?: ToolResultAudience[];
+    audience?: LanguageModelPartAudience[];
 }
 export interface IToolResultDataPart {
     kind: "data";
@@ -144,20 +150,32 @@ export interface IToolResultDataPart {
         mimeType: string;
         data: VSBuffer;
     };
-    audience?: ToolResultAudience[];
+    audience?: LanguageModelPartAudience[];
 }
 export interface IToolConfirmationMessages {
     title: string | IMarkdownString;
     message: string | IMarkdownString;
     disclaimer?: string | IMarkdownString;
     allowAutoConfirm?: boolean;
+    terminalCustomActions?: ToolConfirmationAction[];
+}
+export interface IToolConfirmationAction {
+    label: string;
+    disabled?: boolean;
+    tooltip?: string;
+    data: any;
+}
+export type ToolConfirmationAction = IToolConfirmationAction | Separator;
+export declare enum ToolInvocationPresentation {
+    Hidden = "hidden",
+    HiddenAfterComplete = "hiddenAfterComplete"
 }
 export interface IPreparedToolInvocation {
     invocationMessage?: string | IMarkdownString;
     pastTenseMessage?: string | IMarkdownString;
     originMessage?: string | IMarkdownString;
     confirmationMessages?: IToolConfirmationMessages;
-    presentation?: "hidden" | undefined;
+    presentation?: ToolInvocationPresentation;
     toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
 }
 export interface IToolImpl {