@codingame/monaco-vscode-api 24.3.0 → 25.0.0

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

@@ -1,25 +1,25 @@
-import { Event } from "../../../../base/common/event.js";
-import { IMarkdownString } from "../../../../base/common/htmlContent.js";
-import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
-import { IObservable } from "../../../../base/common/observable.js";
-import { ThemeIcon } from "../../../../base/common/themables.js";
-import { URI, UriComponents, UriDto } from "../../../../base/common/uri.js";
-import { IRange } from "../../../../editor/common/core/range.js";
-import { ISelection } from "../../../../editor/common/core/selection.js";
-import { TextEdit } from "../../../../editor/common/languages.js";
-import { EditSuggestionId } from "../../../../editor/common/textModelEditSource.js";
-import { ILogService } from "../../../../platform/log/common/log.service.js";
-import { ICellEditOperation } from "../../notebook/common/notebookCommon.js";
-import { IChatAgentCommand, IChatAgentData, IChatAgentResult, UserSelectedTools } from "./chatAgents.js";
-import { IChatAgentService } from "./chatAgents.service.js";
-import { IChatEditingSession } from "./chatEditingService.js";
-import { IChatEditingService } from "./chatEditingService.service.js";
-import { IParsedChatRequest } from "./chatParserTypes.js";
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatAgentMarkdownContentWithVulnerability, IChatClearToPreviousToolInvocation, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatEditingSessionAction, IChatElicitationRequest, IChatElicitationRequestSerialized, IChatExtensionsContent, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatMcpServersStarting, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatNotebookEdit, IChatPrepareToolInvocationPart, IChatProgress, IChatProgressMessage, IChatPullRequestContent, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatSessionContext, IChatSessionTiming, IChatTask, IChatTaskSerialized, IChatTextEdit, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsedContext, IChatWarningMessage, ResponseModelState } from "./chatService.js";
-import { IChatService } from "./chatService.service.js";
-import { ChatRequestToolReferenceEntry, IChatRequestVariableEntry } from "./chatVariableEntries.js";
-import { ChatAgentLocation, ChatModeKind } from "./constants.js";
-import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier } from "./languageModels.js";
+import { Event } from "../../../../../base/common/event.js";
+import { IMarkdownString } from "../../../../../base/common/htmlContent.js";
+import { Disposable, IDisposable } from "../../../../../base/common/lifecycle.js";
+import { IObservable } from "../../../../../base/common/observable.js";
+import { ThemeIcon } from "../../../../../base/common/themables.js";
+import { URI, UriComponents, UriDto } from "../../../../../base/common/uri.js";
+import { IRange } from "../../../../../editor/common/core/range.js";
+import { ISelection } from "../../../../../editor/common/core/selection.js";
+import { TextEdit } from "../../../../../editor/common/languages.js";
+import { EditSuggestionId } from "../../../../../editor/common/textModelEditSource.js";
+import { ILogService } from "../../../../../platform/log/common/log.service.js";
+import { ICellEditOperation } from "../../../notebook/common/notebookCommon.js";
+import { IChatAgentCommand, IChatAgentData, IChatAgentResult, UserSelectedTools } from "../participants/chatAgents.js";
+import { IChatAgentService } from "../participants/chatAgents.service.js";
+import { IChatEditingSession } from "../editing/chatEditingService.js";
+import { IChatEditingService } from "../editing/chatEditingService.service.js";
+import { IParsedChatRequest } from "../requestParser/chatParserTypes.js";
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatAgentMarkdownContentWithVulnerability, IChatClearToPreviousToolInvocation, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatEditingSessionAction, IChatElicitationRequest, IChatElicitationRequestSerialized, IChatExtensionsContent, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatMcpServersStarting, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatNotebookEdit, IChatPrepareToolInvocationPart, IChatProgress, IChatProgressMessage, IChatPullRequestContent, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatSessionContext, IChatSessionTiming, IChatTask, IChatTaskSerialized, IChatTextEdit, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsedContext, IChatWarningMessage, ResponseModelState } from "../chatService/chatService.js";
+import { IChatService } from "../chatService/chatService.service.js";
+import { ChatRequestToolReferenceEntry, IChatRequestVariableEntry } from "../attachments/chatVariableEntries.js";
+import { ChatAgentLocation, ChatModeKind } from "../constants.js";
+import { ILanguageModelChatMetadata, ILanguageModelChatMetadataAndIdentifier } from "../languageModels.js";
 export declare const CHAT_ATTACHABLE_IMAGE_MIME_TYPES: Record<string, string>;
 export declare function getAttachableImageExtension(mimeType: string): string | undefined;
 export interface IChatRequestVariableData {
@@ -125,6 +125,7 @@ export interface IChatResponseModel {
     readonly isCanceled: boolean;
     readonly isPendingConfirmation: IObservable<{
         startedWaitingAt: number;
+        detail?: string;
     } | undefined>;
     readonly isInProgress: IObservable<boolean>;
     readonly shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
@@ -337,6 +338,7 @@ export declare class ChatResponseModel extends Disposable implements IChatRespon
     get isStale(): boolean;
     readonly isPendingConfirmation: IObservable<{
         startedWaitingAt: number;
+        detail?: string;
     } | undefined>;
     readonly isInProgress: IObservable<boolean>;
     private _responseView?;
@@ -361,7 +363,6 @@ export declare class ChatResponseModel extends Disposable implements IChatRespon
     setAgent(agent: IChatAgentData, slashCommand?: IChatAgentCommand): void;
     setResult(result: IChatAgentResult): void;
     complete(): void;
-    completeResponseIfNeeded(): void;
     cancel(): void;
     setFollowups(followups: IChatFollowup[] | undefined): void;
     setVote(vote: ChatAgentVoteDirection): void;
@@ -375,6 +376,15 @@ export interface IChatRequestDisablement {
     requestId: string;
     afterUndoStop?: string;
 }
+/**
+ * Information about a chat request that needs user input to continue.
+ */
+export interface IChatRequestNeedsInputInfo {
+    /** The chat session title */
+    readonly title: string;
+    /** Optional detail message, e.g., "<toolname> needs approval to run." */
+    readonly detail?: string;
+}
 export interface IChatModel extends IDisposable {
     readonly onDidDispose: Event<void>;
     readonly onDidChange: Event<IChatChangeEvent>;
@@ -389,8 +399,8 @@ export interface IChatModel extends IDisposable {
     readonly hasCustomTitle: boolean;
     /** True whenever a request is currently running */
     readonly requestInProgress: IObservable<boolean>;
-    /** True whenever a request needs user interaction to continue */
-    readonly requestNeedsInput: IObservable<boolean>;
+    /** Provides session information when a request needs user interaction to continue */
+    readonly requestNeedsInput: IObservable<IChatRequestNeedsInputInfo | undefined>;
     readonly inputPlaceholder?: string;
     readonly editingSession?: IChatEditingSession | undefined;
     readonly checkpoint: IChatRequestModel | undefined;
@@ -653,7 +663,7 @@ export declare class ChatModel extends Disposable implements IChatModel {
     private readonly _sessionResource;
     get sessionResource(): URI;
     readonly requestInProgress: IObservable<boolean>;
-    readonly requestNeedsInput: IObservable<boolean>;
+    readonly requestNeedsInput: IObservable<IChatRequestNeedsInputInfo | undefined>;
     /** Input model for managing input state */
     readonly inputModel: InputModel;
     get hasRequests(): boolean;

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

@@ -1,40 +1,40 @@
 
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { asArray } from '../../../../base/common/arrays.js';
-import { BugIndicatingError } from '../../../../base/common/errors.js';
-import { encodeHex, VSBuffer, decodeHex } from '../../../../base/common/buffer.js';
-import { Emitter } from '../../../../base/common/event.js';
-import { MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../base/common/map.js';
-import { revive } from '../../../../base/common/marshalling.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { equals } from '../../../../base/common/objects.js';
-import '../../../../base/common/observableInternal/index.js';
-import { basename, isEqual } from '../../../../base/common/resources.js';
-import { URI, isUriComponents } from '../../../../base/common/uri.js';
-import { generateUuid } from '../../../../base/common/uuid.js';
-import { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
-import { TextEdit } from '../../../../editor/common/languages.js';
-import { localize } from '../../../../nls.js';
-import { ILogService } from '../../../../platform/log/common/log.service.js';
-import { CellUri } from '../../notebook/common/notebookCommon.js';
-import { migrateLegacyTerminalToolSpecificData } from './chat.js';
-import { reviveSerializedAgent } from './chatAgents.js';
-import { IChatAgentService } from './chatAgents.service.js';
-import { editEntriesToMultiDiffData, ModifiedFileEntryState } from './chatEditingService.js';
-import { IChatEditingService } from './chatEditingService.service.js';
-import { reviveParsedChatRequest, ChatRequestTextPart } from './chatParserTypes.js';
-import { IChatToolInvocation, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ElicitationState, isIUsedContext } from './chatService.js';
-import { IChatService } from './chatService.service.js';
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { asArray } from '../../../../../base/common/arrays.js';
+import { BugIndicatingError } from '../../../../../base/common/errors.js';
+import { encodeHex, VSBuffer, decodeHex } from '../../../../../base/common/buffer.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { MarkdownString, isMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { revive } from '../../../../../base/common/marshalling.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { equals } from '../../../../../base/common/objects.js';
+import '../../../../../base/common/observableInternal/index.js';
+import { basename, isEqual } from '../../../../../base/common/resources.js';
+import { URI, isUriComponents } from '../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
+import { TextEdit } from '../../../../../editor/common/languages.js';
+import { localize } from '../../../../../nls.js';
+import { ILogService } from '../../../../../platform/log/common/log.service.js';
+import { CellUri } from '../../../notebook/common/notebookCommon.js';
+import { migrateLegacyTerminalToolSpecificData } from '../chat.js';
+import { reviveSerializedAgent } from '../participants/chatAgents.js';
+import { IChatAgentService } from '../participants/chatAgents.service.js';
+import { editEntriesToMultiDiffData, ModifiedFileEntryState } from '../editing/chatEditingService.js';
+import { IChatEditingService } from '../editing/chatEditingService.service.js';
+import { reviveParsedChatRequest, ChatRequestTextPart } from '../requestParser/chatParserTypes.js';
+import { IChatToolInvocation, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ElicitationState, isIUsedContext } from '../chatService/chatService.js';
+import { IChatService } from '../chatService/chatService.service.js';
 import { LocalChatSessionUri } from './chatUri.js';
-import { ChatAgentLocation, ChatModeKind } from './constants.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
-import { autorunSelfDisposable, autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
-import { observableValueOpts } from '../../../../base/common/observableInternal/observables/observableValueOpts.js';
-import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
-import { observableSignalFromEvent } from '../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
-import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
+import { ChatAgentLocation, ChatModeKind } from '../constants.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { autorunSelfDisposable, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { observableValueOpts } from '../../../../../base/common/observableInternal/observables/observableValueOpts.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { observableSignalFromEvent } from '../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 
 var ChatModel_1;
 const CHAT_ATTACHABLE_IMAGE_MIME_TYPES = {
@@ -213,7 +213,7 @@ class AbstractResponse {
             blocks.push(currentBlockSegments.join(''));
         }
         if (hasEditGroupsAfterLastClear) {
-            blocks.push(( localize(5936, "Made changes.")));
+            blocks.push(( localize(5960, "Made changes.")));
         }
         return blocks.join('\n\n');
     }
@@ -317,13 +317,13 @@ class Response extends AbstractResponse {
         if (progress.kind === 'clearToPreviousToolInvocation') {
             if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.CopyrightContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    5937,
+                    5961,
                     "Response cleared due to possible match to public code, retrying with modified prompt."
                 )));
             }
             else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    5938,
+                    5962,
                     "Response cleared due to content safety filters, retrying with modified prompt."
                 )));
             }
@@ -371,12 +371,16 @@ class Response extends AbstractResponse {
             this._updateRepr(quiet);
         }
         else if (progress.kind === 'textEdit' || progress.kind === 'notebookEdit') {
-            const useOldApproachForInlineNotebook = progress.uri.scheme === Schemas.vscodeNotebookCell && !this._responseParts.find(part => part.kind === 'notebookEditGroup');
-            const notebookUri = useOldApproachForInlineNotebook ? undefined : CellUri.parse(progress.uri)?.notebook;
+            const notebookUri = CellUri.parse(progress.uri)?.notebook;
             const uri = notebookUri ?? progress.uri;
             let found = false;
             const groupKind = progress.kind === 'textEdit' && !notebookUri ? 'textEditGroup' : 'notebookEditGroup';
-            const edits = groupKind === 'textEditGroup' ? progress.edits : ( progress.edits.map(edit => TextEdit.isTextEdit(edit) ? { uri: progress.uri, edit } : edit));
+            const edits =
+             groupKind === 'textEditGroup' ?
+                progress.edits :
+                ( progress.edits.map(edit => TextEdit.isTextEdit(edit) ?
+                    { uri: progress.uri, edit }
+                    : edit));
             const isExternalEdit = progress.isExternalEdit;
             for (let i = 0; !found && i < this._responseParts.length; i++) {
                 const candidate = this._responseParts[i];
@@ -390,7 +394,7 @@ class Response extends AbstractResponse {
                 this._responseParts.push({
                     kind: groupKind,
                     uri,
-                    edits: groupKind === 'textEditGroup' ? [edits] : edits,
+                    edits: [edits],
                     done: progress.done,
                     isExternalEdit,
                 });
@@ -570,18 +574,30 @@ class ChatResponseModel extends Disposable {
         this._response = this._register(( new Response(params.responseContent)));
         this._codeBlockInfos = params.codeBlockInfos ? [...params.codeBlockInfos] : undefined;
         const signal = observableSignalFromEvent(this, this.onDidChange);
-        const _isPendingBool = ( signal.map((_value, r) => {
+        const _pendingInfo = ( signal.map((_value, r) => {
             signal.read(r);
-            return ( this._response.value.some(
-                part => part.kind === 'toolInvocation' && part.state.read(r).type === IChatToolInvocation.StateKind.WaitingForConfirmation
-                    || part.kind === 'confirmation' && !part.isUsed
-                    || part.kind === 'elicitation2' && part.state.read(r) === ElicitationState.Pending
-            ));
+            for (const part of this._response.value) {
+                if (part.kind === 'toolInvocation' && part.state.read(r).type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
+                    const title = part.confirmationMessages?.title;
+                    return title ? (isMarkdownString(title) ? title.value : title) : undefined;
+                }
+                if (part.kind === 'confirmation' && !part.isUsed) {
+                    return part.title;
+                }
+                if (part.kind === 'elicitation2' && part.state.read(r) === ElicitationState.Pending) {
+                    const title = part.title;
+                    return isMarkdownString(title) ? title.value : title;
+                }
+            }
+            return undefined;
         }));
-        this.isPendingConfirmation = ( _isPendingBool.map(pending => pending ? { startedWaitingAt: Date.now() } : undefined));
+        const _startedWaitingAt = ( ( _pendingInfo.map(p => !!p)).map(p => p ? Date.now() : undefined));
+        this.isPendingConfirmation = ( _startedWaitingAt.map(
+            (waiting, r) => waiting ? { startedWaitingAt: waiting, detail: _pendingInfo.read(r) } : undefined
+        ));
         this.isInProgress = ( signal.map((_value, r) => {
             signal.read(r);
-            return !_isPendingBool.read(r)
+            return !_pendingInfo.read(r)
                 && !this.shouldBeRemovedOnSend
                 && (this._modelState.read(r).value === ResponseModelState.Pending || this._modelState.read(r).value === ResponseModelState.NeedsInput);
         }));
@@ -654,6 +670,9 @@ class ChatResponseModel extends Disposable {
         this._onDidChange.fire(defaultChatResponseModelChangeReason);
     }
     complete() {
+        if (this.isComplete) {
+            return;
+        }
         if (this._result?.errorDetails?.responseIsRedacted) {
             this._response.clear();
         }
@@ -661,11 +680,6 @@ class ChatResponseModel extends Disposable {
         this._modelState.set({ value: state, completedAt: Date.now() }, undefined);
         this._onDidChange.fire({ reason: 'completedRequest' });
     }
-    completeResponseIfNeeded() {
-        if (!this.isComplete) {
-            this.complete();
-        }
-    }
     cancel() {
         this._modelState.set({ value: ResponseModelState.Cancelled, completedAt: Date.now() }, undefined);
         this._onDidChange.fire({ reason: 'completedRequest' });
@@ -958,14 +972,21 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             return request?.response?.isInProgress.read(r) ?? false;
         }));
         this.requestNeedsInput = ( this.lastRequestObs.map((request, r) => {
-            return !!request?.response?.isPendingConfirmation.read(r);
+            const pendingInfo = request?.response?.isPendingConfirmation.read(r);
+            if (!pendingInfo) {
+                return undefined;
+            }
+            return {
+                title: this.title,
+                detail: pendingInfo.detail,
+            };
         }));
         if (this.initialLocation === ChatAgentLocation.Chat && !initialModelProps.disableBackgroundKeepAlive) {
             const selfRef = this._register(( new MutableDisposable()));
             this._register(autorun(r => {
                 const inProgress = this.requestInProgress.read(r);
-                const isWaitingForConfirmation = this.requestNeedsInput.read(r);
-                const shouldStayAlive = inProgress || isWaitingForConfirmation;
+                const needsInput = this.requestNeedsInput.read(r);
+                const shouldStayAlive = inProgress || !!needsInput;
                 if (shouldStayAlive && !selfRef.value) {
                     selfRef.value = chatService.getActiveSessionReference(this._sessionResource);
                 }
@@ -1304,9 +1325,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                             else if (item.kind === 'markdownContent') {
                                 return item.content;
                             }
-                            else if (item.kind === 'confirmation') {
-                                return { ...item, isLive: false };
-                            }
                             else {
                                 return item;
                             }
@@ -1332,7 +1350,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             lastMessageDate: this._lastMessageDate,
             customTitle: this._customTitle,
             hasPendingEdits: !!(this._editingSession?.entries.get().some(e => e.state.get() === ModifiedFileEntryState.Modified)),
-            ...this.inputModel.toJSON(),
+            inputState: this.inputModel.toJSON(),
         };
     }
     dispose() {
@@ -1392,8 +1410,8 @@ function getCodeCitationsMessage(citations) {
     }
     const licenseTypes = citations.reduce((set, c) => set.add(c.license), ( new Set()));
     const label = licenseTypes.size === 1 ?
-        ( localize(5939, "Similar code found with 1 license type", licenseTypes.size)) :
-        ( localize(5940, "Similar code found with {0} license types", licenseTypes.size));
+        ( localize(5963, "Similar code found with 1 license type", licenseTypes.size)) :
+        ( localize(5964, "Similar code found with {0} license types", licenseTypes.size));
     return label;
 }
 var ChatRequestEditedFileEventKind;

package/vscode/src/vs/workbench/contrib/chat/{browser → common/model/chatProgressTypes}/chatElicitationRequestPart.d.ts

@@ -1,9 +1,9 @@
-import { IAction } from "../../../../base/common/actions.js";
-import { IMarkdownString } from "../../../../base/common/htmlContent.js";
-import { Disposable } from "../../../../base/common/lifecycle.js";
-import { IObservable } from "../../../../base/common/observable.js";
-import { ElicitationState, IChatElicitationRequest } from "../common/chatService.js";
-import { ToolDataSource } from "../common/languageModelToolsService.js";
+import { IAction } from "../../../../../../base/common/actions.js";
+import { IMarkdownString } from "../../../../../../base/common/htmlContent.js";
+import { Disposable } from "../../../../../../base/common/lifecycle.js";
+import { IObservable } from "../../../../../../base/common/observable.js";
+import { ElicitationState, IChatElicitationRequest } from "../../chatService/chatService.js";
+import { ToolDataSource } from "../../tools/languageModelToolsService.js";
 export declare class ChatElicitationRequestPart extends Disposable implements IChatElicitationRequest {
     readonly title: string | IMarkdownString;
     readonly message: string | IMarkdownString;
@@ -15,7 +15,7 @@ export declare class ChatElicitationRequestPart extends Disposable implements IC
     readonly moreActions?: IAction[] | undefined;
     readonly onHide?: (() => void) | undefined;
     readonly kind = "elicitation2";
-    state: import("../../../../base/common/observable.js").ISettableObservable<ElicitationState, void>;
+    state: import("../../../../../../base/common/observable.js").ISettableObservable<ElicitationState, void>;
     acceptedResult?: Record<string, unknown>;
     private readonly _isHiddenValue;
     readonly isHidden: IObservable<boolean>;

package/vscode/src/vs/workbench/contrib/chat/{browser → common/model/chatProgressTypes}/chatElicitationRequestPart.js

@@ -1,8 +1,8 @@
 
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import '../../../../base/common/observableInternal/index.js';
-import { ElicitationState } from '../common/chatService.js';
-import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import '../../../../../../base/common/observableInternal/index.js';
+import { ElicitationState } from '../../chatService/chatService.js';
+import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
 
 class ChatElicitationRequestPart extends Disposable {
     constructor(title, message, subtitle, acceptButtonLabel, rejectButtonLabel,

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

@@ -0,0 +1,7 @@
+import { URI } from "../../../../../base/common/uri.js";
+export declare const IChatTransferService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatTransferService>;
+export interface IChatTransferService {
+    readonly _serviceBrand: undefined;
+    checkAndSetTransferredWorkspaceTrust(): Promise<void>;
+    addWorkspaceToTransferred(workspace: URI): void;
+}

package/vscode/src/vs/workbench/contrib/chat/common/{chatTransferService.service.js → model/chatTransferService.service.js}

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

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

@@ -1,8 +1,9 @@
-import { URI } from "../../../../base/common/uri.js";
+import { URI } from "../../../../../base/common/uri.js";
 export declare namespace LocalChatSessionUri {
     const scheme = "vscode-chat-session";
     function forSession(sessionId: string): URI;
     function parseLocalSessionId(resource: URI): string | undefined;
+    function isLocalSession(resource: URI): boolean;
 }
 /**
  * Converts a chat session resource URI to a string ID.

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

@@ -1,8 +1,8 @@
 
-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';
+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) {
@@ -19,6 +19,10 @@ var LocalChatSessionUri;
         return parsed?.chatSessionType === localChatSessionType ? parsed.sessionId : undefined;
     }
     LocalChatSessionUri.parseLocalSessionId = parseLocalSessionId;
+    function isLocalSession(resource) {
+        return !!parseLocalSessionId(resource);
+    }
+    LocalChatSessionUri.isLocalSession = isLocalSession;
     function parse(resource) {
         if (resource.scheme !== LocalChatSessionUri.scheme) {
             return undefined;

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

@@ -1,17 +1,17 @@
-import { Event } from "../../../../base/common/event.js";
-import { IMarkdownString } from "../../../../base/common/htmlContent.js";
-import { Disposable } from "../../../../base/common/lifecycle.js";
-import { ThemeIcon } from "../../../../base/common/themables.js";
-import { URI } from "../../../../base/common/uri.js";
-import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
-import { IChatAgentCommand, IChatAgentData, IChatAgentResult } from "./chatAgents.js";
-import { IChatAgentNameService } from "./chatAgents.service.js";
+import { Event } from "../../../../../base/common/event.js";
+import { IMarkdownString } from "../../../../../base/common/htmlContent.js";
+import { Disposable } from "../../../../../base/common/lifecycle.js";
+import { ThemeIcon } from "../../../../../base/common/themables.js";
+import { URI } from "../../../../../base/common/uri.js";
+import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
+import { IChatAgentCommand, IChatAgentData, IChatAgentResult } from "../participants/chatAgents.js";
+import { IChatAgentNameService } from "../participants/chatAgents.service.js";
 import { IChatModel, IChatProgressRenderableResponseContent, IChatRequestDisablement, IChatRequestModel, IChatResponseModel, IChatTextEditGroup, IResponse } from "./chatModel.js";
-import { IParsedChatRequest } from "./chatParserTypes.js";
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatChangesSummary, IChatCodeCitation, IChatContentReference, IChatFollowup, IChatMcpServersStarting, IChatProgressMessage, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from "./chatService.js";
-import { IChatRequestVariableEntry } from "./chatVariableEntries.js";
-import { CodeBlockModelCollection } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/codeBlockModelCollection";
-import { IChatStreamStats } from "./model/chatStreamStats.js";
+import { IParsedChatRequest } from "../requestParser/chatParserTypes.js";
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatCodeCitation, IChatContentReference, IChatFollowup, IChatMcpServersStarting, IChatProgressMessage, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from "../chatService/chatService.js";
+import { IChatRequestVariableEntry } from "../attachments/chatVariableEntries.js";
+import { CodeBlockModelCollection } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection";
+import { IChatStreamStats } from "./chatStreamStats.js";
 export declare function isRequestVM(item: unknown): item is IChatRequestViewModel;
 export declare function isResponseVM(item: unknown): item is IChatResponseViewModel;
 export declare function isChatTreeItem(item: unknown): item is IChatRequestViewModel | IChatResponseViewModel;
@@ -131,7 +131,8 @@ export interface IChatErrorDetailsPart {
 }
 export interface IChatChangesSummaryPart {
     readonly kind: "changesSummary";
-    readonly fileChanges: ReadonlyArray<IChatChangesSummary>;
+    readonly requestId: string;
+    readonly sessionResource: URI;
 }
 /**
  * Type for content parts rendered by IChatListRenderer (not necessarily in the model)

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

@@ -1,16 +1,16 @@
 
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Emitter } from '../../../../base/common/event.js';
-import { hash } from '../../../../base/common/hash.js';
-import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { hash } from '../../../../../base/common/hash.js';
+import { Disposable, dispose } from '../../../../../base/common/lifecycle.js';
 import { walkTokens, lexer } from 'marked';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { annotateVulnerabilitiesInText } from './annotations.js';
-import { getFullyQualifiedId } from './chatAgents.js';
-import { IChatAgentNameService } from './chatAgents.service.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { annotateVulnerabilitiesInText } from '../widget/annotations.js';
+import { getFullyQualifiedId } from '../participants/chatAgents.js';
+import { IChatAgentNameService } from '../participants/chatAgents.service.js';
 import { countWords } from './chatWordCounter.js';
-import { ChatStreamStatsTracker } from './model/chatStreamStats.js';
+import { ChatStreamStatsTracker } from './chatStreamStats.js';
 
 function isRequestVM(item) {
     return !!item && typeof item === 'object' && 'message' in item;

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

@@ -1,5 +1,5 @@
 
-import { mathInlineRegExp } from '../../markdown/common/markedKatexExtension.js';
+import { mathInlineRegExp } from '../../../markdown/common/markedKatexExtension.js';
 
 const r = String.raw;
 const linkPattern = r `(?<!\\)` +

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

@@ -1,23 +1,23 @@
-import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { Event } from "../../../../base/common/event.js";
-import { IMarkdownString } from "../../../../base/common/htmlContent.js";
-import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
-import { Revived } from "../../../../base/common/marshalling.js";
-import { ThemeIcon } from "../../../../base/common/themables.js";
-import { URI } from "../../../../base/common/uri.js";
-import { Command } from "../../../../editor/common/languages.js";
-import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
-import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
-import { ExtensionIdentifier } from "../../../../platform/extensions/common/extensions.js";
-import { ILogService } from "../../../../platform/log/common/log.service.js";
-import { IProductService } from "../../../../platform/product/common/productService.service.js";
-import { IRequestService } from "../../../../platform/request/common/request.service.js";
-import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
-import { IChatAgentService, type IChatAgentNameService } from "./chatAgents.service.js";
-import { IChatAgentEditedFileEvent, IChatProgressHistoryResponseContent, IChatRequestModeInstructions, IChatRequestVariableData, ISerializableChatAgentData } from "./chatModel.js";
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { Event } from "../../../../../base/common/event.js";
+import { IMarkdownString } from "../../../../../base/common/htmlContent.js";
+import { Disposable, IDisposable } from "../../../../../base/common/lifecycle.js";
+import { Revived } from "../../../../../base/common/marshalling.js";
+import { ThemeIcon } from "../../../../../base/common/themables.js";
+import { URI } from "../../../../../base/common/uri.js";
+import { Command } from "../../../../../editor/common/languages.js";
+import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
+import { IContextKeyService } from "../../../../../platform/contextkey/common/contextkey.service.js";
+import { ExtensionIdentifier } from "../../../../../platform/extensions/common/extensions.js";
+import { ILogService } from "../../../../../platform/log/common/log.service.js";
+import { IProductService } from "../../../../../platform/product/common/productService.service.js";
+import { IRequestService } from "../../../../../platform/request/common/request.service.js";
+import { IStorageService } from "../../../../../platform/storage/common/storage.service.js";
+import { IChatAgentEditedFileEvent, IChatProgressHistoryResponseContent, IChatRequestModeInstructions, IChatRequestVariableData, ISerializableChatAgentData } from "../model/chatModel.js";
 import { IRawChatCommandContribution } from "./chatParticipantContribTypes.js";
-import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from "./chatService.js";
-import { ChatAgentLocation, ChatModeKind } from "./constants.js";
+import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from "../chatService/chatService.js";
+import { ChatAgentLocation, ChatModeKind } from "../constants.js";
+import { IChatAgentService, type IChatAgentNameService } from "./chatAgents.service.js";
 export interface IChatAgentHistoryEntry {
     request: IChatAgentRequest;
     response: ReadonlyArray<IChatProgressHistoryResponseContent | IChatTaskDto>;