@codingame/monaco-vscode-api 24.3.0 → 25.0.0

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

@@ -1,26 +1,26 @@
-import { IAction } from "../../../../base/common/actions.js";
-import { DeferredPromise } from "../../../../base/common/async.js";
-import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { Event } from "../../../../base/common/event.js";
-import { IMarkdownString } from "../../../../base/common/htmlContent.js";
-import { IReference } from "../../../../base/common/lifecycle.js";
-import { IObservable, IReader } from "../../../../base/common/observable.js";
-import { ThemeIcon } from "../../../../base/common/themables.js";
-import { URI, UriComponents } from "../../../../base/common/uri.js";
-import { IRange } from "../../../../editor/common/core/range.js";
-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 { IAutostartResult } from "../../mcp/common/mcpTypes.js";
-import { ICellEditOperation } from "../../notebook/common/notebookCommon.js";
-import { IWorkspaceSymbol } from "../../search/common/search.js";
-import { IChatAgentCommand, IChatAgentData, IChatAgentResult, UserSelectedTools } from "./chatAgents.js";
-import { IChatModel, IChatModelInputState, IChatRequestModeInfo, IChatResponseModel } from "./chatModel.js";
-import { IChatParserContext } from "./chatRequestParser.js";
-import { IChatRequestVariableEntry } from "./chatVariableEntries.js";
-import { IChatRequestVariableValue } from "./chatVariables.js";
-import { ChatAgentLocation } from "./constants.js";
-import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult, IToolResultInputOutputDetails, ToolDataSource } from "./languageModelToolsService.js";
+import { IAction } from "../../../../../base/common/actions.js";
+import { DeferredPromise } from "../../../../../base/common/async.js";
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { Event } from "../../../../../base/common/event.js";
+import { IMarkdownString } from "../../../../../base/common/htmlContent.js";
+import { IReference } from "../../../../../base/common/lifecycle.js";
+import { IObservable, IReader } from "../../../../../base/common/observable.js";
+import { ThemeIcon } from "../../../../../base/common/themables.js";
+import { URI, UriComponents } from "../../../../../base/common/uri.js";
+import { IRange } from "../../../../../editor/common/core/range.js";
+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 { IAutostartResult } from "../../../mcp/common/mcpTypes.js";
+import { ICellEditOperation } from "../../../notebook/common/notebookCommon.js";
+import { IWorkspaceSymbol } from "../../../search/common/search.js";
+import { IChatAgentCommand, IChatAgentData, IChatAgentResult, UserSelectedTools } from "../participants/chatAgents.js";
+import { IChatModel, IChatRequestModeInfo, IChatResponseModel } from "../model/chatModel.js";
+import { IChatParserContext } from "../requestParser/chatRequestParser.js";
+import { IChatRequestVariableEntry } from "../attachments/chatVariableEntries.js";
+import { IChatRequestVariableValue } from "../attachments/chatVariables.js";
+import { ChatAgentLocation } from "../constants.js";
+import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult, IToolResultInputOutputDetails, ToolDataSource } from "../tools/languageModelToolsService.js";
 export interface IChatRequest {
     message: string;
     variables: Record<string, IChatRequestVariableValue[]>;
@@ -67,6 +67,7 @@ export interface IChatContentVariableReference {
     variableName: string;
     value?: URI | Location;
 }
+export declare function isChatContentVariableReference(obj: unknown): obj is IChatContentVariableReference;
 export declare enum ChatResponseReferencePartStatusKind {
     Complete = 1,
     Partial = 2,
@@ -96,12 +97,6 @@ export interface IChatContentReference {
     };
     kind: "reference";
 }
-export interface IChatChangesSummary {
-    readonly reference: URI;
-    readonly sessionId: string;
-    readonly requestId: string;
-    readonly kind: "changesSummary";
-}
 export interface IChatCodeCitation {
     value: URI;
     license: string;
@@ -245,8 +240,6 @@ export interface IChatConfirmation {
     title: string;
     message: string | IMarkdownString;
     data: any;
-    /** Indicates whether this came from a current chat session (true/undefined) or a restored historic session (false) */
-    isLive?: boolean;
     buttons?: string[];
     isUsed?: boolean;
     kind: "confirmation";
@@ -334,6 +327,7 @@ export interface ILegacyChatTerminalToolInvocationData {
     command: string;
     language: string;
 }
+export declare function isLegacyChatTerminalToolInvocationData(data: unknown): data is ILegacyChatTerminalToolInvocationData;
 export interface IChatToolInputInvocationData {
     kind: "input";
     rawInput: any;
@@ -350,6 +344,7 @@ export type ConfirmedReason = {
     type: ToolConfirmKind.Denied;
 } | {
     type: ToolConfirmKind.ConfirmationNotNeeded;
+    reason?: string | IMarkdownString;
 } | {
     type: ToolConfirmKind.Setting;
     id: string;
@@ -424,7 +419,7 @@ export declare namespace IChatToolInvocation {
     export function awaitConfirmation(invocation: IChatToolInvocation, token?: CancellationToken): Promise<ConfirmedReason>;
     export function confirmWith(invocation: IChatToolInvocation | undefined, reason: ConfirmedReason): boolean;
     export function awaitPostConfirmation(invocation: IChatToolInvocation, token?: CancellationToken): Promise<ConfirmedReason>;
-    export function resultDetails(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): (URI | Location)[] | IToolResultInputOutputDetails | IToolResultOutputDetailsSerialized | import("./languageModelToolsService.js").IToolResultOutputDetails | undefined;
+    export function resultDetails(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): IToolResultInputOutputDetails | import("../tools/languageModelToolsService.js").IToolResultOutputDetails | (URI | Location)[] | IToolResultOutputDetailsSerialized | undefined;
     export function isComplete(invocation: IChatToolInvocation | IChatToolInvocationSerialized, reader?: IReader): boolean;
     export {};
 }
@@ -630,6 +625,10 @@ export interface IChatSessionStats {
     added: number;
     removed: number;
 }
+export interface IChatSessionTiming {
+    startTime: number;
+    endTime?: number;
+}
 export declare enum ResponseModelState {
     Pending = 0,
     Complete = 1,
@@ -637,10 +636,6 @@ export declare enum ResponseModelState {
     Failed = 3,
     NeedsInput = 4
 }
-export interface IChatSessionTiming {
-    startTime: number;
-    endTime?: number;
-}
 export interface IChatDetail {
     sessionResource: URI;
     title: string;
@@ -653,11 +648,6 @@ export interface IChatDetail {
 export interface IChatProviderInfo {
     id: string;
 }
-export interface IChatTransferredSessionData {
-    sessionId: string;
-    location: ChatAgentLocation;
-    inputState: IChatModelInputState | undefined;
-}
 export interface IChatSendRequestResponseState {
     responseCreatedPromise: Promise<IChatResponseModel>;
     responseCompletePromise: Promise<void>;

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

@@ -1,10 +1,10 @@
 
-import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import '../../../../base/common/observableInternal/index.js';
-import '../../../../base/common/errors.js';
-import { URI } from '../../../../base/common/uri.js';
-import { Range } from '../../../../editor/common/core/range.js';
-import { autorun, autorunSelfDisposable } from '../../../../base/common/observableInternal/reactions/autorun.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/observableInternal/index.js';
+import '../../../../../base/common/errors.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { autorun, autorunSelfDisposable } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 var ChatErrorLevel;
 (function (ChatErrorLevel) {
@@ -26,6 +26,11 @@ function isIUsedContext(obj) {
         Array.isArray(obj.documents) &&
         obj.documents.every(isIDocumentContext));
 }
+function isChatContentVariableReference(obj) {
+    return !!obj &&
+        typeof obj === 'object' &&
+        typeof obj.variableName === 'string';
+}
 var ChatResponseReferencePartStatusKind;
 (function (ChatResponseReferencePartStatusKind) {
     ChatResponseReferencePartStatusKind[ChatResponseReferencePartStatusKind["Complete"] = 1] = "Complete";
@@ -44,6 +49,9 @@ var ElicitationState;
     ElicitationState["Accepted"] = "accepted";
     ElicitationState["Rejected"] = "rejected";
 })(ElicitationState || (ElicitationState = {}));
+function isLegacyChatTerminalToolInvocationData(data) {
+    return !!data && typeof data === 'object' && 'command' in data;
+}
 var ToolConfirmKind;
 (function (ToolConfirmKind) {
     ToolConfirmKind[ToolConfirmKind["Denied"] = 0] = "Denied";
@@ -159,7 +167,7 @@ var IChatToolInvocation;
     }
     IChatToolInvocation.resultDetails = resultDetails;
     function isComplete(invocation, reader) {
-        if ('isComplete' in invocation) {
+        if (invocation.kind === 'toolInvocationSerialized') {
             return true;
         }
         const state = invocation.state.read(reader);
@@ -229,4 +237,4 @@ var ResponseModelState;
     ResponseModelState[ResponseModelState["NeedsInput"] = 4] = "NeedsInput";
 })(ResponseModelState || (ResponseModelState = {}));
 
-export { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatCopyKind, ChatErrorLevel, ChatMcpServersStarting, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, ElicitationState, IChatToolInvocation, ResponseModelState, ToolConfirmKind, isChatFollowup, isIDocumentContext, isIUsedContext };
+export { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatCopyKind, ChatErrorLevel, ChatMcpServersStarting, ChatResponseClearToPreviousToolInvocationReason, ChatResponseReferencePartStatusKind, ElicitationState, IChatToolInvocation, ResponseModelState, ToolConfirmKind, isChatContentVariableReference, isChatFollowup, isIDocumentContext, isIUsedContext, isLegacyChatTerminalToolInvocationData };

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

@@ -1,16 +1,16 @@
-import { CancellationToken } from "../../../../base/common/cancellation.js";
-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 { IChatModel, IExportableChatData, ISerializableChatData, IChatRequestModel, IChatRequestVariableData } from "./chatModel.js";
-import { IParsedChatRequest } from "./chatParserTypes.js";
-import { IChatTransferredSessionData, IChatSessionStartOptions, IChatModelReference, IChatSessionContext, IChatSendRequestOptions, IChatSendRequestData, IChatProgress, IChatCompleteResponse, IChatDetail, IChatUserActionEvent } from "./chatService.js";
-import { ChatAgentLocation } from "./constants.js";
-export declare const IChatService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatService>;
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { Event } from "../../../../../base/common/event.js";
+import { IObservable } from "../../../../../base/common/observable.js";
+import { URI } from "../../../../../base/common/uri.js";
+import { ChatAgentLocation } from "../constants.js";
+import { IChatEditingSession } from "../editing/chatEditingService.js";
+import { IChatModel, IExportableChatData, ISerializableChatData, IChatRequestModel, IChatRequestVariableData } from "../model/chatModel.js";
+import { IParsedChatRequest } from "../requestParser/chatParserTypes.js";
+import { IChatSessionStartOptions, IChatModelReference, IChatSessionContext, IChatSendRequestOptions, IChatSendRequestData, IChatProgress, IChatCompleteResponse, IChatDetail, IChatUserActionEvent } from "./chatService.js";
+export declare const IChatService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatService>;
 export interface IChatService {
     _serviceBrand: undefined;
-    transferredSessionData: IChatTransferredSessionData | undefined;
+    transferredSessionResource: URI | undefined;
     readonly onDidSubmitRequest: Event<{
         readonly chatSessionResource: URI;
     }>;
@@ -30,8 +30,7 @@ export interface IChatService {
     */
     getActiveSessionReference(sessionResource: URI): IChatModelReference | undefined;
     getOrRestoreSession(sessionResource: URI): Promise<IChatModelReference | undefined>;
-    getPersistedSessionTitle(sessionResource: URI): string | undefined;
-    isPersistedSessionEmpty(sessionResource: URI): boolean;
+    getSessionTitle(sessionResource: URI): string | undefined;
     loadSessionFromContent(data: IExportableChatData | ISerializableChatData | URI): IChatModelReference | undefined;
     loadSessionForResource(resource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModelReference | undefined>;
     readonly editingSessions: IChatEditingSession[];
@@ -62,10 +61,10 @@ export interface IChatService {
     readonly onDidPerformUserAction: Event<IChatUserActionEvent>;
     notifyUserAction(event: IChatUserActionEvent): void;
     readonly onDidDisposeSession: Event<{
-        readonly sessionResource: URI;
+        readonly sessionResource: URI[];
         readonly reason: "cleared";
     }>;
-    transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
+    transferChatSession(transferredSessionResource: URI, toWorkspace: URI): Promise<void>;
     activateDefaultAgent(location: ChatAgentLocation): Promise<void>;
     readonly edits2Enabled: boolean;
     readonly requestInProgressObs: IObservable<boolean>;

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

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+
+const IChatService = ( createDecorator('IChatService'));
+
+export { IChatService };

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

@@ -5,10 +5,10 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { URI } from "../../../../base/common/uri.js";
-import { IChatAgentAttachmentCapabilities, IChatAgentRequest } from "./chatAgents.js";
-import { IChatEditingSession } from "./chatEditingService.js";
-import { IChatRequestVariableData, ISerializableChatModelInputState } from "./chatModel.js";
-import { IChatProgress } from "./chatService.js";
+import { IChatAgentAttachmentCapabilities, IChatAgentRequest } from "./participants/chatAgents.js";
+import { IChatEditingSession } from "./editing/chatEditingService.js";
+import { IChatRequestVariableData, ISerializableChatModelInputState } from "./model/chatModel.js";
+import { IChatProgress } from "./chatService/chatService.js";
 export declare enum ChatSessionStatus {
     Failed = 0,
     Completed = 1,
@@ -57,6 +57,7 @@ export interface IChatSessionItem {
     resource: URI;
     label: string;
     iconPath?: ThemeIcon;
+    badge?: string | IMarkdownString;
     description?: string | IMarkdownString;
     status?: ChatSessionStatus;
     tooltip?: string | IMarkdownString;
@@ -70,8 +71,6 @@ export interface IChatSessionItem {
         deletions: number;
     } | readonly IChatSessionFileChange[];
     archived?: boolean;
-    /** @deprecated */
-    history?: boolean;
 }
 export interface IChatSessionFileChange {
     modifiedUri: URI;
@@ -121,10 +120,6 @@ export interface IChatSessionItemProvider {
     readonly chatSessionType: string;
     readonly onDidChangeChatSessionItems: Event<void>;
     provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]>;
-    provideNewChatSessionItem?(options: {
-        request: IChatAgentRequest;
-        metadata?: any;
-    }, token: CancellationToken): Promise<IChatSessionItem>;
 }
 export interface IChatSessionContentProvider {
     provideChatSessionContent(sessionResource: URI, token: CancellationToken): Promise<IChatSession>;
@@ -133,3 +128,4 @@ export type SessionOptionsChangedCallback = (sessionResource: URI, updates: Read
     optionId: string;
     value: string | IChatSessionProviderOptionItem;
 }>) => Promise<void>;
+export declare function isSessionInProgressStatus(state: ChatSessionStatus): boolean;

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

@@ -8,5 +8,8 @@ var ChatSessionStatus;
     ChatSessionStatus[ChatSessionStatus["NeedsInput"] = 3] = "NeedsInput";
 })(ChatSessionStatus || (ChatSessionStatus = {}));
 const localChatSessionType = 'local';
+function isSessionInProgressStatus(state) {
+    return state === ChatSessionStatus.InProgress || state === ChatSessionStatus.NeedsInput;
+}
 
-export { ChatSessionStatus, localChatSessionType };
+export { ChatSessionStatus, isSessionInProgressStatus, localChatSessionType };

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

@@ -3,11 +3,11 @@ 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 { IChatAgentAttachmentCapabilities } from "./chatAgents.js";
-import { IChatModel } from "./chatModel.js";
-import { IChatService } from "./chatService.service.js";
-import { IChatSessionItemProvider, IChatSessionsExtensionPoint, IChatSessionItem, IChatSessionContentProvider, IChatSession, IChatSessionProviderOptionItem, IChatSessionProviderOptionGroup, SessionOptionsChangedCallback, ChatSessionStatus } from "./chatSessionsService.js";
+import { IChatService } from "./chatService/chatService.service.js";
+import { IChatSessionItemProvider, IChatSessionsExtensionPoint, IChatSessionItem, IChatSessionContentProvider, IChatSession, IChatSessionProviderOptionItem, IChatSessionProviderOptionGroup, SessionOptionsChangedCallback } from "./chatSessionsService.js";
+import { IChatModel } from "./model/chatModel.js";
+import { IChatAgentAttachmentCapabilities } from "./participants/chatAgents.js";
+export declare const IChatSessionsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatSessionsService>;
 export interface IChatSessionsService {
     readonly _serviceBrand: undefined;
     readonly onDidChangeItemsProviders: Event<IChatSessionItemProvider>;
@@ -63,11 +63,6 @@ export interface IChatSessionsService {
         optionId: string;
         value: string | IChatSessionProviderOptionItem;
     }>): Promise<void>;
-    setEditableSession(sessionResource: URI, data: IEditableData | null): Promise<void>;
-    getEditableData(sessionResource: URI): IEditableData | undefined;
-    isEditable(sessionResource: URI): boolean;
     registerChatModelChangeListeners(chatService: IChatService, chatSessionType: string, onChange: () => void): IDisposable;
     getInProgressSessionDescription(chatModel: IChatModel): string | undefined;
-    isChatSessionInProgressStatus(state: ChatSessionStatus): boolean;
 }
-export declare const IChatSessionsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatSessionsService>;

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

@@ -11,11 +11,9 @@ export declare enum ChatConfiguration {
     EligibleForAutoApproval = "chat.tools.eligibleForAutoApproval",
     EnableMath = "chat.math.enabled",
     CheckpointsEnabled = "chat.checkpoints.enabled",
-    AgentSessionsViewLocation = "chat.agentSessionsViewLocation",
     ThinkingStyle = "chat.agent.thinkingStyle",
     ThinkingGenerateTitles = "chat.agent.thinking.generateTitles",
     TodosShowWidget = "chat.tools.todos.showWidget",
-    ShowAgentSessionsViewDescription = "chat.showAgentSessionsViewDescription",
     NotifyWindowOnResponseReceived = "chat.notifyWindowOnResponseReceived",
     ChatViewSessionsEnabled = "chat.viewSessions.enabled",
     ChatViewSessionsOrientation = "chat.viewSessions.orientation",
@@ -65,8 +63,6 @@ export declare namespace ChatAgentLocation {
     function fromRaw(value: RawChatParticipantLocation | string): ChatAgentLocation;
 }
 export declare function isSupportedChatFileScheme(accessor: ServicesAccessor, scheme: string): boolean;
-/** @deprecated */
-export declare const LEGACY_AGENT_SESSIONS_VIEW_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;

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

@@ -15,11 +15,9 @@ var ChatConfiguration;
     ChatConfiguration["EligibleForAutoApproval"] = "chat.tools.eligibleForAutoApproval";
     ChatConfiguration["EnableMath"] = "chat.math.enabled";
     ChatConfiguration["CheckpointsEnabled"] = "chat.checkpoints.enabled";
-    ChatConfiguration["AgentSessionsViewLocation"] = "chat.agentSessionsViewLocation";
     ChatConfiguration["ThinkingStyle"] = "chat.agent.thinkingStyle";
     ChatConfiguration["ThinkingGenerateTitles"] = "chat.agent.thinking.generateTitles";
     ChatConfiguration["TodosShowWidget"] = "chat.tools.todos.showWidget";
-    ChatConfiguration["ShowAgentSessionsViewDescription"] = "chat.showAgentSessionsViewDescription";
     ChatConfiguration["NotifyWindowOnResponseReceived"] = "chat.notifyWindowOnResponseReceived";
     ChatConfiguration["ChatViewSessionsEnabled"] = "chat.viewSessions.enabled";
     ChatConfiguration["ChatViewSessionsOrientation"] = "chat.viewSessions.orientation";
@@ -99,10 +97,9 @@ function isSupportedChatFileScheme(accessor, scheme) {
     }
     return true;
 }
-const LEGACY_AGENT_SESSIONS_VIEW_ID = 'workbench.view.chat.sessions';
 const MANAGE_CHAT_COMMAND_ID = 'workbench.action.chat.manage';
 const ChatEditorTitleMaxLength = 30;
 const CONTEXT_MODELS_EDITOR = ( new RawContextKey('inModelsEditor', false));
 const CONTEXT_MODELS_SEARCH_FOCUS = ( new RawContextKey('inModelsSearch', false));
 
-export { CONTEXT_MODELS_EDITOR, CONTEXT_MODELS_SEARCH_FOCUS, ChatAgentLocation, ChatConfiguration, ChatEditorTitleMaxLength, ChatModeKind, CollapsedToolsDisplayMode, LEGACY_AGENT_SESSIONS_VIEW_ID, MANAGE_CHAT_COMMAND_ID, ThinkingDisplayMode, isSupportedChatFileScheme, validateChatMode };
+export { CONTEXT_MODELS_EDITOR, CONTEXT_MODELS_SEARCH_FOCUS, ChatAgentLocation, ChatConfiguration, ChatEditorTitleMaxLength, ChatModeKind, CollapsedToolsDisplayMode, MANAGE_CHAT_COMMAND_ID, ThinkingDisplayMode, isSupportedChatFileScheme, validateChatMode };

package/vscode/src/vs/workbench/contrib/chat/common/{chatContext.d.ts → contextContrib/chatContext.d.ts}

@@ -1,6 +1,6 @@
-import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { ThemeIcon } from "../../../../base/common/themables.js";
-import { URI } from "../../../../base/common/uri.js";
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { ThemeIcon } from "../../../../../base/common/themables.js";
+import { URI } from "../../../../../base/common/uri.js";
 export interface IChatContextItem {
     icon: ThemeIcon;
     label: string;

package/vscode/src/vs/workbench/contrib/chat/common/{chatCodeMapperService.service.d.ts → editing/chatCodeMapperService.service.d.ts}

@@ -1,7 +1,7 @@
-import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { ICodeMapperProvider, ICodeMapperRequest, ICodeMapperResponse, ICodeMapperResult } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService";
-export declare const ICodeMapperService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ICodeMapperService>;
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { IDisposable } from "../../../../../base/common/lifecycle.js";
+import { ICodeMapperProvider, ICodeMapperRequest, ICodeMapperResponse, ICodeMapperResult } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/editing/chatCodeMapperService";
+export declare const ICodeMapperService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ICodeMapperService>;
 export interface ICodeMapperService {
     readonly _serviceBrand: undefined;
     readonly providers: ICodeMapperProvider[];

package/vscode/src/vs/workbench/contrib/chat/common/{chatCodeMapperService.service.js → editing/chatCodeMapperService.service.js}

@@ -1,5 +1,5 @@
 
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 
 const ICodeMapperService = ( createDecorator('codeMapperService'));
 

package/vscode/src/vs/workbench/contrib/chat/common/{chatEditingService.d.ts → editing/chatEditingService.d.ts}

@@ -1,19 +1,19 @@
-import { VSBuffer } from "../../../../base/common/buffer.js";
-import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { Event } from "../../../../base/common/event.js";
-import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { IObservable, IReader } from "../../../../base/common/observable.js";
-import { URI } from "../../../../base/common/uri.js";
+import { VSBuffer } from "../../../../../base/common/buffer.js";
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { Event } from "../../../../../base/common/event.js";
+import { IDisposable } from "../../../../../base/common/lifecycle.js";
+import { IObservable, IReader } from "../../../../../base/common/observable.js";
+import { URI } from "../../../../../base/common/uri.js";
 import { IDocumentDiff } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/editor/common/diff/documentDiffProvider";
-import { Location, TextEdit } from "../../../../editor/common/languages.js";
-import { ITextModel } from "../../../../editor/common/model.js";
-import { EditSuggestionId } from "../../../../editor/common/textModelEditSource.js";
-import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
-import { IEditorPane } from "../../../common/editor.js";
-import { ICellEditOperation } from "../../notebook/common/notebookCommon.js";
-import { IChatAgentResult } from "./chatAgents.js";
-import { IChatRequestDisablement, IChatResponseModel } from "./chatModel.js";
-import { IChatMultiDiffData, IChatProgress } from "./chatService.js";
+import { Location, TextEdit } from "../../../../../editor/common/languages.js";
+import { ITextModel } from "../../../../../editor/common/model.js";
+import { EditSuggestionId } from "../../../../../editor/common/textModelEditSource.js";
+import { RawContextKey } from "../../../../../platform/contextkey/common/contextkey.js";
+import { IEditorPane } from "../../../../common/editor.js";
+import { ICellEditOperation } from "../../../notebook/common/notebookCommon.js";
+import { IChatAgentResult } from "../participants/chatAgents.js";
+import { IChatRequestDisablement, IChatResponseModel } from "../model/chatModel.js";
+import { IChatMultiDiffData, IChatProgress } from "../chatService/chatService.js";
 export interface IChatRequestDraft {
     readonly prompt: string;
     readonly files: readonly URI[];

package/vscode/src/vs/workbench/contrib/chat/common/{chatEditingService.js → editing/chatEditingService.js}

@@ -1,12 +1,12 @@
 
-import { encodeHex, VSBuffer, decodeHex } from '../../../../base/common/buffer.js';
-import '../../../../base/common/errors.js';
-import '../../../../base/common/observableInternal/index.js';
-import { hasKey } from '../../../../base/common/types.js';
-import { URI } from '../../../../base/common/uri.js';
-import { localize } from '../../../../nls.js';
-import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { autorunSelfDisposable } from '../../../../base/common/observableInternal/reactions/autorun.js';
+import { encodeHex, VSBuffer, decodeHex } from '../../../../../base/common/buffer.js';
+import '../../../../../base/common/errors.js';
+import '../../../../../base/common/observableInternal/index.js';
+import { hasKey } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize } from '../../../../../nls.js';
+import { RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { autorunSelfDisposable } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 function chatEditingSessionIsReady(session) {
     return ( new Promise(resolve => {
@@ -24,7 +24,7 @@ function editEntriesToMultiDiffData(entriesObs) {
         kind: 'multiDiffData',
         collapsed: true,
         multiDiffData: ( entriesObs.map(entries => ({
-            title: ( localize(5933, 'Changes to {0} files', entries.length)),
+            title: ( localize(5946, 'Changes to {0} files', entries.length)),
             resources: ( entries.map(entry => ({
                 originalUri: entry.originalURI,
                 modifiedUri: entry.modifiedURI,
@@ -61,9 +61,9 @@ var ChatEditingSessionState;
     ChatEditingSessionState[ChatEditingSessionState["Disposed"] = 3] = "Disposed";
 })(ChatEditingSessionState || (ChatEditingSessionState = {}));
 const CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME = 'chat-editing-multi-diff-source';
-const chatEditingWidgetFileStateContextKey = ( new RawContextKey('chatEditingWidgetFileState', undefined, ( localize(5934, "The current state of the file in the chat editing widget"))));
+const chatEditingWidgetFileStateContextKey = ( new RawContextKey('chatEditingWidgetFileState', undefined, ( localize(5947, "The current state of the file in the chat editing widget"))));
 const chatEditingAgentSupportsReadonlyReferencesContextKey = ( new RawContextKey('chatEditingAgentSupportsReadonlyReferences', undefined, ( localize(
-    5935,
+    5948,
     "Whether the chat editing agent supports readonly references (temporary)"
 ))));
 const decidedChatEditingResourceContextKey = ( new RawContextKey('decidedChatEditingResource', []));

package/vscode/src/vs/workbench/contrib/chat/common/{chatEditingService.service.d.ts → editing/chatEditingService.service.d.ts}

@@ -1,10 +1,10 @@
-import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { IObservable } from "../../../../base/common/observable.js";
-import { URI } from "../../../../base/common/uri.js";
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { IDisposable } from "../../../../../base/common/lifecycle.js";
+import { IObservable } from "../../../../../base/common/observable.js";
+import { URI } from "../../../../../base/common/uri.js";
+import { ChatModel } from "../model/chatModel.js";
 import { IChatEditingSession, IChatRelatedFilesProvider, IChatRelatedFile } from "./chatEditingService.js";
-import { ChatModel } from "./chatModel.js";
-export declare const IChatEditingService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatEditingService>;
+export declare const IChatEditingService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatEditingService>;
 export interface IChatEditingService {
     _serviceBrand: undefined;
     startOrContinueGlobalEditingSession(chatModel: ChatModel): IChatEditingSession;

package/vscode/src/vs/workbench/contrib/chat/common/{chatEditingService.service.js → editing/chatEditingService.service.js}

@@ -1,5 +1,5 @@
 
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 
 const IChatEditingService = ( createDecorator('chatEditingService'));
 

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

@@ -30,13 +30,13 @@ LanguageModelStatsService = ( __decorate([
 const CopilotUsageExtensionFeatureId = 'copilot';
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: CopilotUsageExtensionFeatureId,
-    label: ( localize(5951, "Copilot")),
-    description: ( localize(5952, "Language models usage statistics of this extension.")),
+    label: ( localize(5949, "Copilot")),
+    description: ( localize(5950, "Language models usage statistics of this extension.")),
     icon: Codicon.copilot,
     access: {
         canToggle: false
     },
-    accessDataLabel: ( localize(5953, "chat")),
+    accessDataLabel: ( localize(5951, "chat")),
 });
 
 export { CopilotUsageExtensionFeatureId, LanguageModelStatsService };

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

@@ -17,7 +17,7 @@ import { ChatEntitlement } from '../../../services/chat/common/chatEntitlementSe
 import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.service.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
 import { ExtensionsRegistry } from '../../../services/extensions/common/extensionsRegistry.js';
-import { ChatContextKeys } from './chatContextKeys.js';
+import { ChatContextKeys } from './actions/chatContextKeys.js';
 
 var ChatMessageRole;
 (function (ChatMessageRole) {
@@ -82,23 +82,23 @@ const languageModelChatProviderType = {
     properties: {
         vendor: {
             type: 'string',
-            description: ( localize(5957, "A globally unique vendor of language model chat provider."))
+            description: ( localize(5952, "A globally unique vendor of language model chat provider."))
         },
         displayName: {
             type: 'string',
-            description: ( localize(5958, "The display name of the language model chat provider."))
+            description: ( localize(5953, "The display name of the language model chat provider."))
         },
         managementCommand: {
             type: 'string',
             description: ( localize(
-                5959,
+                5954,
                 "A command to manage the language model chat provider, e.g. 'Manage Copilot models'. This is used in the chat model picker. If not provided, a gear icon is not rendered during vendor selection."
             ))
         },
         when: {
             type: 'string',
             description: ( localize(
-                5960,
+                5955,
                 "Condition which must be true to show this language model chat provider in the Manage Models list."
             ))
         }
@@ -107,7 +107,7 @@ const languageModelChatProviderType = {
 const languageModelChatProviderExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languageModelChatProviders',
     jsonSchema: {
-        description: ( localize(5961, "Contribute language model chat providers of a specific vendor.")),
+        description: ( localize(5956, "Contribute language model chat providers of a specific vendor.")),
         oneOf: [
             languageModelChatProviderType,
             {
@@ -157,18 +157,18 @@ let LanguageModelsService = class LanguageModelsService {
                 for (const item of Iterable.wrap(extension.value)) {
                     if (( this._vendors.has(item.vendor))) {
                         extension.collector.error(( localize(
-                            5962,
+                            5957,
                             "The vendor '{0}' is already registered and cannot be registered twice",
                             item.vendor
                         )));
                         continue;
                     }
                     if (isFalsyOrWhitespace(item.vendor)) {
-                        extension.collector.error(( localize(5963, "The vendor field cannot be empty.")));
+                        extension.collector.error(( localize(5958, "The vendor field cannot be empty.")));
                         continue;
                     }
                     if (item.vendor.trim() !== item.vendor) {
-                        extension.collector.error(( localize(5964, "The vendor field cannot start or end with whitespace.")));
+                        extension.collector.error(( localize(5959, "The vendor field cannot start or end with whitespace.")));
                         continue;
                     }
                     this._vendors.set(item.vendor, item);