@codingame/monaco-vscode-api 22.1.9 → 23.0.0

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

@@ -3,53 +3,52 @@ import { Event } from "../../../../base/common/event.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IChatEditingSession } from "./chatEditingService.js";
-import { ChatModel, IChatModel, IExportableChatData, ISerializableChatData, IChatRequestModel, IChatRequestVariableData } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
-import { IChatTransferredSessionData, IChatSendRequestOptions, IChatSendRequestData, IChatCompleteResponse, IChatDetail, IChatUserActionEvent } from "./chatService.js";
+import { ChatModel, IChatModel, IExportableChatData, ISerializableChatData, IChatRequestModel, IChatRequestVariableData } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { IChatTransferredSessionData, IChatSessionContext, IChatSendRequestOptions, IChatSendRequestData, IChatCompleteResponse, IChatDetail, IChatUserActionEvent } from "./chatService.js";
 import { ChatAgentLocation } from "./constants.js";
 export declare const IChatService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatService>;
 export interface IChatService {
     _serviceBrand: undefined;
     transferredSessionData: IChatTransferredSessionData | undefined;
-    onDidSubmitRequest: Event<{
-        chatSessionId: string;
+    readonly onDidSubmitRequest: Event<{
+        readonly chatSessionResource: URI;
     }>;
     isEnabled(location: ChatAgentLocation): boolean;
     hasSessions(): boolean;
-    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;
+    startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean, options?: {
+        canUseTools?: boolean;
+    }): ChatModel;
+    getSession(sessionResource: URI): IChatModel | undefined;
+    getSessionByLegacyId(sessionId: string): IChatModel | undefined;
+    getOrRestoreSession(sessionResource: URI): Promise<IChatModel | undefined>;
+    getPersistedSessionTitle(sessionResource: URI): string | undefined;
+    isPersistedSessionEmpty(sessionResource: URI): boolean;
     loadSessionFromContent(data: IExportableChatData | ISerializableChatData | URI): IChatModel | undefined;
     loadSessionForResource(resource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined>;
     readonly editingSessions: IChatEditingSession[];
-    getChatSessionFromInternalId(sessionId: string): {
-        chatSessionType: string;
-        chatSessionId: string;
-        isUntitled: boolean;
-    } | undefined;
+    getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined;
     /**
     * Returns whether the request was accepted.`
     */
-    sendRequest(sessionId: string, message: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
+    sendRequest(sessionResource: URI, message: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
     resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;
-    adoptRequest(sessionId: string, request: IChatRequestModel): Promise<void>;
-    removeRequest(sessionid: string, requestId: string): Promise<void>;
-    cancelCurrentRequestForSession(sessionId: string): void;
-    clearSession(sessionId: string): Promise<void>;
-    addCompleteRequest(sessionId: string, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): void;
-    getHistory(): Promise<IChatDetail[]>;
-    setChatSessionTitle(sessionId: string, title: string): void;
+    adoptRequest(sessionResource: URI, request: IChatRequestModel): Promise<void>;
+    removeRequest(sessionResource: URI, requestId: string): Promise<void>;
+    cancelCurrentRequestForSession(sessionResource: URI): void;
+    clearSession(sessionResource: URI): Promise<void>;
+    addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): void;
+    setChatSessionTitle(sessionResource: URI, title: string): void;
+    getLocalSessionHistory(): Promise<IChatDetail[]>;
     clearAllHistoryEntries(): Promise<void>;
-    removeHistoryEntry(sessionId: string): Promise<void>;
+    removeHistoryEntry(sessionResource: URI): Promise<void>;
     getChatStorageFolder(): URI;
     logChatIndex(): void;
-    onDidPerformUserAction: Event<IChatUserActionEvent>;
+    readonly onDidPerformUserAction: Event<IChatUserActionEvent>;
     notifyUserAction(event: IChatUserActionEvent): void;
-    onDidDisposeSession: Event<{
-        sessionId: string;
-        reason: "cleared";
+    readonly onDidDisposeSession: Event<{
+        readonly sessionResource: URI;
+        readonly reason: "cleared";
     }>;
     transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
     activateDefaultAgent(location: ChatAgentLocation): Promise<void>;

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

@@ -4,8 +4,10 @@ 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 { 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 { URI } from "../../../../base/common/uri.js";
+import { IChatAgentAttachmentCapabilities, IChatAgentRequest } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatEditingSession } from "./chatEditingService.js";
+import { IChatRequestVariableData } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatProgress } from "./chatService.js";
 export declare enum ChatSessionStatus {
     Failed = 0,
@@ -17,27 +19,45 @@ export interface IChatSessionCommandContribution {
     description: string;
     when?: string;
 }
+export interface IChatSessionProviderOptionItem {
+    id: string;
+    name: string;
+}
+export interface IChatSessionProviderOptionGroup {
+    id: string;
+    name: string;
+    description?: string;
+    items: IChatSessionProviderOptionItem[];
+}
 export interface IChatSessionsExtensionPoint {
     readonly type: string;
     readonly name: string;
     readonly displayName: string;
     readonly description: string;
-    readonly extensionDescription: IRelaxedExtensionDescription;
     readonly when?: string;
-    readonly capabilities?: {
-        supportsFileAttachments?: boolean;
-        supportsToolAttachments?: boolean;
+    readonly icon?: string | {
+        light: string;
+        dark: string;
     };
+    readonly order?: number;
+    readonly alternativeIds?: string[];
+    readonly welcomeTitle?: string;
+    readonly welcomeMessage?: string;
+    readonly welcomeTips?: string;
+    readonly inputPlaceholder?: string;
+    readonly capabilities?: IChatAgentAttachmentCapabilities;
     readonly commands?: IChatSessionCommandContribution[];
 }
 export interface IChatSessionItem {
+    /** @deprecated Use {@link resource} instead */
     id: string;
+    resource: URI;
     label: string;
     iconPath?: ThemeIcon;
     description?: string | IMarkdownString;
     status?: ChatSessionStatus;
     tooltip?: string | IMarkdownString;
-    timing?: {
+    timing: {
         startTime: number;
         endTime?: number;
     };
@@ -50,18 +70,33 @@ export type IChatSessionHistoryItem = {
     type: "request";
     prompt: string;
     participant: string;
+    command?: string;
+    variableData?: IChatRequestVariableData;
 } | {
     type: "response";
     parts: IChatProgress[];
     participant: string;
 };
-export interface ChatSession extends IDisposable {
-    readonly sessionId: string;
+/**
+ * The session type used for local agent chat sessions.
+ */
+export declare const localChatSessionType = "local";
+export interface IChatSession extends IDisposable {
     readonly onWillDispose: Event<void>;
-    history: Array<IChatSessionHistoryItem>;
+    readonly sessionResource: URI;
+    readonly history: readonly IChatSessionHistoryItem[];
+    /**
+     * Session options as key-value pairs. Keys correspond to option group IDs (e.g., 'models', 'subagents')
+     * and values are the selected option item IDs.
+     */
+    readonly options?: Record<string, string>;
     readonly progressObs?: IObservable<IChatProgress[]>;
     readonly isCompleteObs?: IObservable<boolean>;
     readonly interruptActiveResponseCallback?: () => Promise<boolean>;
+    /**
+     * Editing session transferred from a previously-untitled chat session in `onDidCommitChatSessionItem`.
+     */
+    initialEditingSession?: IChatEditingSession;
     requestHandler?: (request: IChatAgentRequest, progress: (progress: IChatProgress[]) => void, history: any[], // TODO: Nail down types
     token: CancellationToken) => Promise<void>;
 }
@@ -75,5 +110,9 @@ export interface IChatSessionItemProvider {
     }, token: CancellationToken): Promise<IChatSessionItem>;
 }
 export interface IChatSessionContentProvider {
-    provideChatSessionContent(sessionId: string, token: CancellationToken): Promise<ChatSession>;
+    provideChatSessionContent(sessionResource: URI, token: CancellationToken): Promise<IChatSession>;
 }
+export type SessionOptionsChangedCallback = (sessionResource: URI, updates: ReadonlyArray<{
+    optionId: string;
+    value: string;
+}>) => Promise<void>;

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

@@ -6,5 +6,6 @@ var ChatSessionStatus;
     ChatSessionStatus[ChatSessionStatus["Completed"] = 1] = "Completed";
     ChatSessionStatus[ChatSessionStatus["InProgress"] = 2] = "InProgress";
 })(ChatSessionStatus || (ChatSessionStatus = {}));
+const localChatSessionType = 'local';
 
-export { ChatSessionStatus };
+export { ChatSessionStatus, localChatSessionType };

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

@@ -1,9 +1,11 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { ThemeIcon } from "../../../../base/common/themables.js";
+import { URI } from "../../../../base/common/uri.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";
+import { IChatAgentRequest, IChatAgentAttachmentCapabilities } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatSessionItemProvider, IChatSessionsExtensionPoint, IChatSessionItem, IChatSessionContentProvider, IChatSession, IChatSessionProviderOptionGroup, SessionOptionsChangedCallback } from "./chatSessionsService.js";
 export interface IChatSessionsService {
     readonly _serviceBrand: undefined;
     readonly onDidChangeItemsProviders: Event<IChatSessionItemProvider>;
@@ -11,25 +13,54 @@ export interface IChatSessionsService {
     readonly onDidChangeAvailability: Event<void>;
     readonly onDidChangeInProgress: Event<void>;
     registerChatSessionItemProvider(provider: IChatSessionItemProvider): IDisposable;
-    getAllChatSessionContributions(): IChatSessionsExtensionPoint[];
-    canResolveItemProvider(chatSessionType: string): Promise<boolean>;
+    hasChatSessionItemProvider(chatSessionType: string): Promise<boolean>;
     getAllChatSessionItemProviders(): IChatSessionItemProvider[];
-    provideNewChatSessionItem(chatSessionType: string, options: {
+    getAllChatSessionContributions(): IChatSessionsExtensionPoint[];
+    getIconForSessionType(chatSessionType: string): ThemeIcon | URI | undefined;
+    getWelcomeTitleForSessionType(chatSessionType: string): string | undefined;
+    getWelcomeMessageForSessionType(chatSessionType: string): string | undefined;
+    getInputPlaceholderForSessionType(chatSessionType: string): string | undefined;
+    /**
+    * Get the list of chat session items grouped by session type.
+    */
+    getAllChatSessionItems(token: CancellationToken): Promise<Array<{
+        readonly chatSessionType: string;
+        readonly items: IChatSessionItem[];
+    }>>;
+    getNewChatSessionItem(chatSessionType: string, options: {
         request: IChatAgentRequest;
         metadata?: any;
     }, token: CancellationToken): Promise<IChatSessionItem>;
-    provideChatSessionItems(chatSessionType: string, token: CancellationToken): Promise<IChatSessionItem[]>;
     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;
+    readonly onDidChangeContentProviderSchemes: Event<{
+        readonly added: string[];
+        readonly removed: string[];
+    }>;
+    getContentProviderSchemes(): string[];
+    registerChatSessionContentProvider(scheme: string, provider: IChatSessionContentProvider): IDisposable;
+    canResolveChatSession(sessionResource: URI): Promise<boolean>;
+    getOrCreateChatSession(sessionResource: URI, token: CancellationToken): Promise<IChatSession>;
+    hasAnySessionOptions(sessionResource: URI): boolean;
+    getSessionOption(sessionResource: URI, optionId: string): string | undefined;
+    setSessionOption(sessionResource: URI, optionId: string, value: string): boolean;
+    /**
+    * Get the capabilities for a specific session type
+    */
+    getCapabilitiesForSessionType(chatSessionType: string): IChatAgentAttachmentCapabilities | undefined;
+    getOptionGroupsForSessionType(chatSessionType: string): IChatSessionProviderOptionGroup[] | undefined;
+    setOptionGroupsForSessionType(chatSessionType: string, handle: number, optionGroups?: IChatSessionProviderOptionGroup[]): void;
+    setOptionsChangeCallback(callback: SessionOptionsChangedCallback): void;
+    notifySessionOptionsChange(sessionResource: URI, updates: ReadonlyArray<{
+        optionId: string;
+        value: string;
+    }>): Promise<void>;
+    setEditableSession(sessionResource: URI, data: IEditableData | null): Promise<void>;
+    getEditableData(sessionResource: URI): IEditableData | undefined;
+    isEditable(sessionResource: URI): boolean;
 }
 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,7 +1,10 @@
+import { Event } from "../../../../base/common/event.js";
+import { URI } from "../../../../base/common/uri.js";
 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;
-    getTodos(sessionId: string): IChatTodo[];
-    setTodos(sessionId: string, todos: IChatTodo[]): void;
+    readonly onDidUpdateTodos: Event<URI>;
+    getTodos(sessionResource: URI): IChatTodo[];
+    setTodos(sessionResource: URI, todos: IChatTodo[]): void;
 }

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

@@ -0,0 +1,25 @@
+import { URI } from "../../../../base/common/uri.js";
+type ChatSessionIdentifier = {
+    readonly chatSessionType: string;
+    readonly sessionId: string;
+};
+export declare namespace LocalChatSessionUri {
+    const scheme = "vscode-chat-session";
+    function forSession(sessionId: string): URI;
+    function parseLocalSessionId(resource: URI): string | undefined;
+    /**
+     * @deprecated Does not support non-local sessions
+     */
+    function forChatSessionTypeAndId(chatSessionType: string, sessionId: string): URI;
+    /**
+     * @deprecated Legacy parser that supports non-local sessions.
+     */
+    function parse(resource: URI): ChatSessionIdentifier | undefined;
+}
+/**
+ * Converts a chat session resource URI to a string ID.
+ *
+ * This exists mainly for backwards compatibility with existing code that uses string IDs in telemetry and storage.
+ */
+export declare function chatSessionResourceToId(resource: URI): string;
+export {};

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

@@ -0,0 +1,51 @@
+
+import { encodeBase64, VSBuffer, decodeBase64 } from '../../../../base/common/buffer.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localChatSessionType } from './chatSessionsService.js';
+
+var LocalChatSessionUri;
+(function (LocalChatSessionUri) {
+    LocalChatSessionUri.scheme = Schemas.vscodeLocalChatSession;
+    function forSession(sessionId) {
+        return forChatSessionTypeAndId(localChatSessionType, sessionId);
+    }
+    LocalChatSessionUri.forSession = forSession;
+    function parseLocalSessionId(resource) {
+        const parsed = parse(resource);
+        return parsed?.chatSessionType === localChatSessionType ? parsed.sessionId : undefined;
+    }
+    LocalChatSessionUri.parseLocalSessionId = parseLocalSessionId;
+    function forChatSessionTypeAndId(chatSessionType, sessionId) {
+        const encodedId = encodeBase64(VSBuffer.wrap(( new TextEncoder()).encode(sessionId)), false, true);
+        return ( URI.from(
+            { scheme: LocalChatSessionUri.scheme, authority: chatSessionType, path: '/' + encodedId }
+        ));
+    }
+    LocalChatSessionUri.forChatSessionTypeAndId = forChatSessionTypeAndId;
+    function parse(resource) {
+        if (resource.scheme !== LocalChatSessionUri.scheme) {
+            return undefined;
+        }
+        if (!resource.authority) {
+            return undefined;
+        }
+        const parts = resource.path.split('/');
+        if (parts.length !== 2) {
+            return undefined;
+        }
+        const chatSessionType = resource.authority;
+        const decodedSessionId = decodeBase64(parts[1]);
+        return { chatSessionType, sessionId: ( new TextDecoder()).decode(decodedSessionId.buffer) };
+    }
+    LocalChatSessionUri.parse = parse;
+})(LocalChatSessionUri || (LocalChatSessionUri = {}));
+function chatSessionResourceToId(resource) {
+    const localId = LocalChatSessionUri.parseLocalSessionId(resource);
+    if (localId) {
+        return localId;
+    }
+    return ( resource.toString());
+}
+
+export { LocalChatSessionUri, chatSessionResourceToId };

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

@@ -4,7 +4,7 @@ import { IRange } from "../../../../editor/common/core/range.js";
 import { IOffsetRange } from "../../../../editor/common/core/ranges/offsetRange.js";
 import { Location, SymbolKind } from "../../../../editor/common/languages.js";
 import { MarkerSeverity, IMarker } from "../../../../platform/markers/common/markers.js";
-import { ISCMHistoryItem } from "../../scm/common/history.js";
+import { ISCMHistoryItem } from "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/common/history";
 import { IChatContentReference } from "./chatService.js";
 import { IChatRequestVariableValue } from "./chatVariables.js";
 import { IToolData, ToolSet } from "./languageModelToolsService.js";
@@ -45,13 +45,28 @@ export interface IChatRequestToolSetEntry extends IBaseChatRequestVariableEntry
     readonly value: IChatRequestToolEntry[];
 }
 export type ChatRequestToolReferenceEntry = IChatRequestToolEntry | IChatRequestToolSetEntry;
+export interface StringChatContextValue {
+    value: string;
+    name: string;
+    modelDescription?: string;
+    icon: ThemeIcon;
+    uri: URI;
+}
 export interface IChatRequestImplicitVariableEntry extends IBaseChatRequestVariableEntry {
     readonly kind: "implicit";
     readonly isFile: true;
-    readonly value: URI | Location | undefined;
+    readonly value: URI | Location | StringChatContextValue | undefined;
+    readonly uri: URI | undefined;
     readonly isSelection: boolean;
     enabled: boolean;
 }
+export interface IChatRequestStringVariableEntry extends IBaseChatRequestVariableEntry {
+    readonly kind: "string";
+    readonly value: string;
+    readonly modelDescription?: string;
+    readonly icon: ThemeIcon;
+    readonly uri: URI;
+}
 export interface IChatRequestPasteVariableEntry extends IBaseChatRequestVariableEntry {
     readonly kind: "paste";
     readonly code: string;
@@ -141,7 +156,15 @@ export interface ISCMHistoryItemChangeRangeVariableEntry extends IBaseChatReques
         readonly historyItem: ISCMHistoryItem;
     };
 }
-export type IChatRequestVariableEntry = IGenericChatRequestVariableEntry | IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry | ISymbolVariableEntry | ICommandResultVariableEntry | IDiagnosticVariableEntry | IImageVariableEntry | IChatRequestToolEntry | IChatRequestToolSetEntry | IChatRequestDirectoryEntry | IChatRequestFileEntry | INotebookOutputVariableEntry | IElementVariableEntry | IPromptFileVariableEntry | IPromptTextVariableEntry | ISCMHistoryItemVariableEntry | ISCMHistoryItemChangeVariableEntry | ISCMHistoryItemChangeRangeVariableEntry;
+export interface ITerminalVariableEntry extends IBaseChatRequestVariableEntry {
+    readonly kind: "terminalCommand";
+    readonly value: string;
+    readonly resource: URI;
+    readonly command: string;
+    readonly output?: string;
+    readonly exitCode?: number;
+}
+export type IChatRequestVariableEntry = IGenericChatRequestVariableEntry | IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry | ISymbolVariableEntry | ICommandResultVariableEntry | IDiagnosticVariableEntry | IImageVariableEntry | IChatRequestToolEntry | IChatRequestToolSetEntry | IChatRequestDirectoryEntry | IChatRequestFileEntry | INotebookOutputVariableEntry | IElementVariableEntry | IPromptFileVariableEntry | IPromptTextVariableEntry | ISCMHistoryItemVariableEntry | ISCMHistoryItemChangeVariableEntry | ISCMHistoryItemChangeRangeVariableEntry | ITerminalVariableEntry | IChatRequestStringVariableEntry;
 export declare namespace IChatRequestVariableEntry {
     /**
      * Returns URI of the passed variant entry. Return undefined if not found.
@@ -149,6 +172,8 @@ export declare namespace IChatRequestVariableEntry {
     function toUri(entry: IChatRequestVariableEntry): URI | undefined;
 }
 export declare function isImplicitVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestImplicitVariableEntry;
+export declare function isStringVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestStringVariableEntry;
+export declare function isTerminalVariableEntry(obj: IChatRequestVariableEntry): obj is ITerminalVariableEntry;
 export declare function isPasteVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestPasteVariableEntry;
 export declare function isImageVariableEntry(obj: IChatRequestVariableEntry): obj is IImageVariableEntry;
 export declare function isNotebookOutputVariableEntry(obj: IChatRequestVariableEntry): obj is INotebookOutputVariableEntry;
@@ -161,6 +186,7 @@ export declare function isChatRequestVariableEntry(obj: unknown): obj is IChatRe
 export declare function isSCMHistoryItemVariableEntry(obj: IChatRequestVariableEntry): obj is ISCMHistoryItemVariableEntry;
 export declare function isSCMHistoryItemChangeVariableEntry(obj: IChatRequestVariableEntry): obj is ISCMHistoryItemChangeVariableEntry;
 export declare function isSCMHistoryItemChangeRangeVariableEntry(obj: IChatRequestVariableEntry): obj is ISCMHistoryItemChangeRangeVariableEntry;
+export declare function isStringImplicitContextValue(value: unknown): value is StringChatContextValue;
 export declare enum PromptFileVariableKind {
     Instruction = "vscode.prompt.instructions.root",
     InstructionReference = "vscode.prompt.instructions",

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

@@ -36,7 +36,7 @@ var IDiagnosticVariableEntryFilterData;
     }
     IDiagnosticVariableEntryFilterData.toEntry = toEntry;
     function id(data) {
-        return [data.filterUri, data.owner, data.filterSeverity, data.filterRange?.startLineNumber].join(':');
+        return [data.filterUri, data.owner, data.filterSeverity, data.filterRange?.startLineNumber, data.filterRange?.startColumn].join(':');
     }
     IDiagnosticVariableEntryFilterData.id = id;
     function label(data) {
@@ -55,9 +55,9 @@ var IDiagnosticVariableEntryFilterData;
             }
             return data.problemMessage.substring(0, lastSpace) + '…';
         }
-        let labelStr = ( localize(5603, "All Problems"));
+        let labelStr = ( localize(5807, "All Problems"));
         if (data.filterUri) {
-            labelStr = ( localize(5604, "Problems in {0}", basename(data.filterUri)));
+            labelStr = ( localize(5808, "Problems in {0}", basename(data.filterUri)));
         }
         return labelStr;
     }
@@ -74,6 +74,12 @@ var IChatRequestVariableEntry;
     }
     IChatRequestVariableEntry.toUri = toUri;
 })(IChatRequestVariableEntry || (IChatRequestVariableEntry = {}));
+function isStringVariableEntry(obj) {
+    return obj.kind === 'string';
+}
+function isTerminalVariableEntry(obj) {
+    return obj.kind === 'terminalCommand';
+}
 function isPasteVariableEntry(obj) {
     return obj.kind === 'paste';
 }
@@ -104,6 +110,15 @@ function isSCMHistoryItemChangeVariableEntry(obj) {
 function isSCMHistoryItemChangeRangeVariableEntry(obj) {
     return obj.kind === 'scmHistoryItemChangeRange';
 }
+function isStringImplicitContextValue(value) {
+    const asStringImplicitContextValue = value;
+    return (typeof asStringImplicitContextValue === 'object' &&
+        asStringImplicitContextValue !== null &&
+        typeof asStringImplicitContextValue.value === 'string' &&
+        typeof asStringImplicitContextValue.name === 'string' &&
+        ThemeIcon.isThemeIcon(asStringImplicitContextValue.icon) &&
+        URI.isUri(asStringImplicitContextValue.uri));
+}
 var PromptFileVariableKind;
 (function (PromptFileVariableKind) {
     PromptFileVariableKind["Instruction"] = "vscode.prompt.instructions.root";
@@ -191,4 +206,4 @@ class ChatRequestVariableSet {
     }
 }
 
-export { ChatRequestVariableSet, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData, OmittedState, PromptFileVariableKind, isChatRequestFileEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemVariableEntry, toPromptFileVariableEntry, toPromptTextVariableEntry, toToolSetVariableEntry, toToolVariableEntry };
+export { ChatRequestVariableSet, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData, OmittedState, PromptFileVariableKind, isChatRequestFileEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemVariableEntry, isStringImplicitContextValue, isStringVariableEntry, isTerminalVariableEntry, toPromptFileVariableEntry, toPromptTextVariableEntry, toToolSetVariableEntry, toToolVariableEntry };

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

@@ -3,9 +3,9 @@ import { ThemeIcon } from "../../../../base/common/themables.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IRange } from "../../../../editor/common/core/range.js";
 import { Location } from "../../../../editor/common/languages.js";
-import { IChatModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IChatContentReference, IChatProgressMessage } from "./chatService.js";
-import { IDiagnosticVariableEntryFilterData } from "./chatVariableEntries.js";
+import { IDiagnosticVariableEntryFilterData, StringChatContextValue } from "./chatVariableEntries.js";
 export interface IChatVariableData {
     id: string;
     name: string;
@@ -20,7 +20,7 @@ export interface IChatRequestProblemsVariable {
     filter: IDiagnosticVariableEntryFilterData;
 }
 export declare const isIChatRequestProblemsVariable: (obj: unknown) => obj is IChatRequestProblemsVariable;
-export type IChatRequestVariableValue = string | URI | Location | Uint8Array | IChatRequestProblemsVariable | unknown;
+export type IChatRequestVariableValue = string | URI | Location | Uint8Array | IChatRequestProblemsVariable | StringChatContextValue | unknown;
 export type IChatVariableResolverProgress = IChatContentReference | IChatProgressMessage;
 export interface IChatVariableResolver {
     (messageText: string, arg: string | undefined, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableValue | undefined>;

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

@@ -1,8 +1,9 @@
+import { URI } from "../../../../base/common/uri.js";
 import { IDynamicVariable } from "./chatVariables.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>;
-    getSelectedToolAndToolSets(sessionId: string): IToolAndToolSetEnablementMap;
+    getDynamicVariables(sessionResource: URI): ReadonlyArray<IDynamicVariable>;
+    getSelectedToolAndToolSets(sessionResource: URI): IToolAndToolSetEnablementMap;
 }

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

@@ -1,5 +1,5 @@
 import { Event } from "../../../../base/common/event.js";
-import { IChatHistoryEntry } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService";
+import { IChatHistoryEntry } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService";
 import { ChatAgentLocation } from "./constants.js";
 export declare const IChatWidgetHistoryService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatWidgetHistoryService>;
 export interface IChatWidgetHistoryService {

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

@@ -1,3 +1,5 @@
+import { ServicesAccessor } from "../../../../platform/instantiation/common/instantiation.js";
+import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 export declare enum ChatConfiguration {
     AgentEnabled = "chat.agent.enabled",
     Edits2Enabled = "chat.edits2.enabled",
@@ -9,14 +11,15 @@ export declare enum ChatConfiguration {
     CheckpointsEnabled = "chat.checkpoints.enabled",
     AgentSessionsViewLocation = "chat.agentSessionsViewLocation",
     ThinkingStyle = "chat.agent.thinkingStyle",
-    TodoList = "chat.agent.todoList",
+    TodosShowWidget = "chat.tools.todos.showWidget",
     UseCloudButtonV2 = "chat.useCloudButtonV2",
     ShowAgentSessionsViewDescription = "chat.showAgentSessionsViewDescription",
     EmptyStateHistoryEnabled = "chat.emptyState.history.enabled",
-    NotifyWindowOnResponseReceived = "chat.notifyWindowOnResponseReceived"
+    NotifyWindowOnResponseReceived = "chat.notifyWindowOnResponseReceived",
+    SubagentToolCustomAgents = "chat.customAgentInSubagent.enabled"
 }
 /**
- * The "kind" of the chat mode- "Agent" for custom modes.
+ * The "kind" of agents for custom agents.
  */
 export declare enum ChatModeKind {
     Ask = "ask",
@@ -28,9 +31,7 @@ export declare function isChatMode(mode: unknown): mode is ChatModeKind;
 export declare enum ThinkingDisplayMode {
     Collapsed = "collapsed",
     CollapsedPreview = "collapsedPreview",
-    Expanded = "expanded",
-    None = "none",
-    CollapsedPerItem = "collapsedPerItem"
+    FixedScrolling = "fixedScrolling"
 }
 export type RawChatParticipantLocation = "panel" | "terminal" | "notebook" | "editing-session";
 export declare enum ChatAgentLocation {
@@ -49,5 +50,10 @@ export declare enum ChatAgentLocation {
 export declare namespace ChatAgentLocation {
     function fromRaw(value: RawChatParticipantLocation | string): ChatAgentLocation;
 }
-export declare const ChatUnsupportedFileSchemes: Set<string>;
-export declare const VIEWLET_ID = "workbench.view.chat.sessions";
+export declare function isSupportedChatFileScheme(accessor: ServicesAccessor, scheme: string): boolean;
+export declare const AGENT_SESSIONS_VIEWLET_ID = "workbench.view.chat.sessions";
+export declare const MANAGE_CHAT_COMMAND_ID = "workbench.action.chat.manage";
+export declare const ChatEditorTitleMaxLength = 30;
+export declare const CHAT_TERMINAL_OUTPUT_MAX_PREVIEW_LINES = 1000;
+export declare const CONTEXT_MODELS_EDITOR: RawContextKey<boolean>;
+export declare const CONTEXT_MODELS_SEARCH_FOCUS: RawContextKey<boolean>;