@codingame/monaco-vscode-chat-service-override 29.1.0 → 30.0.0

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

@@ -0,0 +1,158 @@
+
+import { match } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
+import { getExtensionForMimeType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/mime';
+import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import { basename as basename$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { isToolResultInputOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+
+function matchMimeType(pattern, mimeType) {
+    if (pattern === mimeType) {
+        return true;
+    }
+    const [patternType, patternSubtype] = pattern.split("/");
+    const [type] = mimeType.split("/");
+    return patternSubtype === "*" && patternType === type;
+}
+function findFilePathRule(filePath, byFilePath) {
+    const fileBasename = basename(filePath);
+    for (const [pattern, config] of Object.entries(byFilePath)) {
+        if (match(pattern, filePath) || match(pattern, fileBasename)) {
+            return config;
+        }
+    }
+    return undefined;
+}
+function findMimeTypeRule(mimeType, byMimeType) {
+    for (const [pattern, config] of Object.entries(byMimeType)) {
+        if (matchMimeType(pattern, mimeType)) {
+            return config;
+        }
+    }
+    return undefined;
+}
+function isToolResultOutputDetailsSerialized(obj) {
+    return typeof obj === "object" && obj !== null && "output" in obj && typeof obj.output === "object" && obj.output?.type === "data" && typeof obj.output?.mimeType === "string";
+}
+function extractArtifactsFromResponse(response, sessionResource, byMimeType, byFilePath) {
+    const artifacts = [];
+    const seenUris = ( new Set());
+    for (const part of response.value) {
+        if (part.kind === "codeblockUri") {
+            const uri = part.uri;
+            const uriStr = ( uri.toString());
+            if (( seenUris.has(uriStr))) {
+                continue;
+            }
+            const rule = findFilePathRule(uri.path, byFilePath);
+            if (rule) {
+                seenUris.add(uriStr);
+                artifacts.push({
+                    label: basename$1(uri),
+                    uri: uriStr,
+                    type: "plan",
+                    groupName: rule.groupName,
+                    onlyShowGroup: rule.onlyShowGroup
+                });
+            }
+        }
+        if (part.kind === "textEditGroup") {
+            const uri = part.uri;
+            const uriStr = ( uri.toString());
+            if (( seenUris.has(uriStr))) {
+                continue;
+            }
+            const rule = findFilePathRule(uri.path, byFilePath);
+            if (rule) {
+                seenUris.add(uriStr);
+                artifacts.push({
+                    label: basename$1(uri),
+                    uri: uriStr,
+                    type: "plan",
+                    groupName: rule.groupName,
+                    onlyShowGroup: rule.onlyShowGroup
+                });
+            }
+        }
+        if (part.kind === "workspaceEdit") {
+            for (const edit of part.edits) {
+                const uri = edit.newResource ?? edit.oldResource;
+                if (!uri) {
+                    continue;
+                }
+                const uriStr = ( uri.toString());
+                if (( seenUris.has(uriStr))) {
+                    continue;
+                }
+                const rule = findFilePathRule(uri.path, byFilePath);
+                if (rule) {
+                    seenUris.add(uriStr);
+                    artifacts.push({
+                        label: basename$1(uri),
+                        uri: uriStr,
+                        type: "plan",
+                        groupName: rule.groupName,
+                        onlyShowGroup: rule.onlyShowGroup
+                    });
+                }
+            }
+        }
+        if (part.kind === "toolInvocation" || part.kind === "toolInvocationSerialized") {
+            const details = IChatToolInvocation.resultDetails(part);
+            if (!details) {
+                continue;
+            }
+            if (isToolResultInputOutputDetails(details)) {
+                for (let i = 0; i < details.output.length; i++) {
+                    const outputPart = details.output[i];
+                    if (outputPart.type === "embed" && !outputPart.isText && outputPart.mimeType) {
+                        const rule = findMimeTypeRule(outputPart.mimeType, byMimeType);
+                        if (rule) {
+                            const key = `${part.toolCallId}:${i}`;
+                            if (!( seenUris.has(key))) {
+                                seenUris.add(key);
+                                const ext = getExtensionForMimeType(outputPart.mimeType);
+                                const permalinkBasename = ext ? `file${ext}` : "file.bin";
+                                const artifactUri = ChatResponseResource.createUri(sessionResource, part.toolCallId, i, permalinkBasename);
+                                artifacts.push({
+                                    label: outputPart.uri?.path.split("/").pop() ?? `${rule.groupName} ${i + 1}`,
+                                    uri: ( artifactUri.toString()),
+                                    toolCallId: part.toolCallId,
+                                    dataPartIndex: i,
+                                    type: "screenshot",
+                                    groupName: rule.groupName,
+                                    onlyShowGroup: rule.onlyShowGroup
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+            if (isToolResultOutputDetailsSerialized(details)) {
+                const rule = findMimeTypeRule(details.output.mimeType, byMimeType);
+                if (rule) {
+                    const key = `${part.toolCallId}:0`;
+                    if (!( seenUris.has(key))) {
+                        seenUris.add(key);
+                        const ext = getExtensionForMimeType(details.output.mimeType);
+                        const permalinkBasename = ext ? `file${ext}` : "file.bin";
+                        const artifactUri = ChatResponseResource.createUri(sessionResource, part.toolCallId, 0, permalinkBasename);
+                        artifacts.push({
+                            label: `${rule.groupName}`,
+                            uri: ( artifactUri.toString()),
+                            toolCallId: part.toolCallId,
+                            dataPartIndex: 0,
+                            type: "screenshot",
+                            groupName: rule.groupName,
+                            onlyShowGroup: rule.onlyShowGroup
+                        });
+                    }
+                }
+            }
+        }
+    }
+    return artifacts;
+}
+
+export { extractArtifactsFromResponse };

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

@@ -1,6 +1,6 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
@@ -64,7 +64,7 @@ export declare class ChatService extends Disposable implements IChatService {
     }>;
     private readonly _onDidDisposeSession;
     readonly onDidDisposeSession: Event<{
-        readonly sessionResource: URI[];
+        readonly sessionResources: URI[];
         reason: "cleared";
     }>;
     private readonly _sessionFollowupCancelTokens;
@@ -140,6 +140,11 @@ export declare class ChatService extends Disposable implements IChatService {
     private refreshFollowupsCancellationToken;
     private _sendRequestAsync;
     processPendingRequests(sessionResource: URI): void;
+    /**
+     * Returns true if the session is backed by an agent host server, which
+     * controls queued-message dequeuing on the server side.
+     */
+    private _isServerManagedQueue;
     /**
      * Process the next pending request from the model's queue, if any.
      * Called after a request completes to continue processing queued requests.
@@ -167,5 +172,5 @@ export declare class ChatService extends Disposable implements IChatService {
     setSessionTitle(sessionResource: URI, title: string): void;
     appendProgress(request: IChatRequestModel, progress: IChatProgress): void;
     private toLocalSessionId;
-    registerChatModelChangeListeners(chatSessionType: string, onChange: (chatSessionResource: URI) => void): IDisposable;
 }
+export declare function chatModelToChatDetail(model: IChatModel): Promise<IChatDetail>;

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

@@ -7,7 +7,7 @@ import { ErrorNoTelemetry, BugIndicatingError } from '@codingame/monaco-vscode-a
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-import { Disposable, DisposableResourceMap, DisposableStore, MutableDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableResourceMap, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -32,13 +32,14 @@ import { IChatDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { InlineChatConfigKeys } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { awaitStatsForSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
+import { clearChatMarks, markChat, ChatPerfMark } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatPerf';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { chatEditingSessionIsReady } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, ChatRequestModel, updateRanges, toChatHistoryContent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatModelStore } from '../model/chatModelStore.js';
 import { ChatRequestTextPart, ChatRequestSlashCommandPart, getPromptText, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
-import { ResponseModelState, ChatPendingRequestChangeEventName, ChatRequestQueueKind, ChatMcpServersStarting, ChatStopCancellationNoopEventName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { ChatPendingRequestChangeEventName, ChatRequestQueueKind, ChatMcpServersStarting, ChatStopCancellationNoopEventName, ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ChatServiceTelemetry, ChatRequestTelemetry } from './chatServiceTelemetry.js';
 import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
@@ -55,10 +56,10 @@ import { ChatSessionOperationLog } from '../model/chatSessionOperationLog.js';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { AGENT_DEBUG_LOG_ENABLED_SETTING, AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING, TROUBLESHOOT_COMMAND_NAME, COPILOT_SKILL_URI_SCHEME, TROUBLESHOOT_SKILL_PATH } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { mergeHooks } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
-import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
+import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
-import { autorun, autorunIterableDelta } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
-import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 const serializedChatKey = "interactive.sessions";
@@ -180,9 +181,10 @@ let ChatService = class ChatService extends Disposable {
             }
         }));
         this._register(this._sessionModels.onDidDisposeModel(model => {
+            clearChatMarks(model.sessionResource);
             this.chatDebugService.endSession(model.sessionResource);
             this._onDidDisposeSession.fire({
-                sessionResource: [model.sessionResource],
+                sessionResources: [model.sessionResource],
                 reason: "cleared"
             });
         }));
@@ -343,18 +345,7 @@ let ChatService = class ChatService extends Disposable {
         return [...liveSessionItems, ...historySessionItems];
     }
     async getLiveSessionItems() {
-        return await Promise.all(( Array.from(( this._sessionModels.values())).filter(session => this.shouldBeInHistory(session)).map(async session => {
-            const title = session.title || ( localize(7200, "New Chat"));
-            return {
-                sessionResource: session.sessionResource,
-                title,
-                lastMessageDate: session.lastMessageDate,
-                timing: session.timing,
-                isActive: true,
-                stats: await awaitStatsForSession(session),
-                lastResponseState: session.lastRequest?.response?.state ?? ResponseModelState.Pending
-            };
-        })));
+        return await Promise.all(( Array.from(( this._sessionModels.values())).filter(session => this.shouldBeInHistory(session)).map(chatModelToChatDetail)));
     }
     async getHistorySessionItems() {
         const index = await this._chatSessionStore.getIndex();
@@ -385,7 +376,7 @@ let ChatService = class ChatService extends Disposable {
     async removeHistoryEntry(sessionResource) {
         await this._chatSessionStore.deleteSession(this.toLocalSessionId(sessionResource));
         this._onDidDisposeSession.fire({
-            sessionResource: [sessionResource],
+            sessionResources: [sessionResource],
             reason: "cleared"
         });
     }
@@ -527,14 +518,68 @@ let ChatService = class ChatService extends Disposable {
             }
         }
         const chatSessionType = getChatSessionType(sessionResource);
+        const contribution = this.chatSessionService.getChatSessionContribution(chatSessionType);
+        const modelId = findLast(
+            providedSession.history.filter(m => m.type === "request"),
+            req => req.modelId
+        )?.modelId;
+        const agentUri = findLast(
+            providedSession.history.filter(m => m.type === "request"),
+            req => req.modeInstructions?.uri
+        )?.modeInstructions?.uri;
+        const storedPermissionLevel = this._chatSessionStore.getMetadataForSessionSync(sessionResource)?.permissionLevel;
+        let initialData = undefined;
+        if ((modelId || agentUri) && contribution?.useRequestToPopulateBuiltInPickers) {
+            const mode = agentUri ? {
+                kind: ChatModeKind.Agent,
+                id: ( agentUri.toString())
+            } : {
+                kind: ChatModeKind.Agent,
+                id: ChatMode.Agent.id
+            };
+            const modelMetadata = modelId ? this.languageModelsService.lookupLanguageModel(modelId) : undefined;
+            const selectedModel = modelId && modelMetadata ? {
+                identifier: modelId,
+                metadata: modelMetadata
+            } : undefined;
+            initialData = {
+                serializer: ( new ChatSessionOperationLog()),
+                value: {
+                    creationDate: Date.now(),
+                    initialLocation: undefined,
+                    customTitle: undefined,
+                    requests: [],
+                    responderUsername: "",
+                    sessionId: "",
+                    version: 3,
+                    hasPendingEdits: undefined,
+                    inputState: {
+                        attachments: [],
+                        contrib: {},
+                        inputText: "",
+                        mode,
+                        selectedModel: selectedModel,
+                        selections: [],
+                        permissionLevel: storedPermissionLevel
+                    },
+                    pendingRequests: undefined,
+                    repoData: undefined
+                }
+            };
+        }
         const modelRef = this._sessionModels.acquireOrCreate({
-            initialData: undefined,
+            initialData,
             location,
             sessionResource: sessionResource,
             canUseTools: false,
             transferEditingSession: providedSession.transferredState?.editingSession,
             inputState: providedSession.transferredState?.inputState
         });
+        if (storedPermissionLevel && !initialData) {
+            modelRef.object.inputModel.setState({
+                permissionLevel: storedPermissionLevel
+            });
+        }
         modelRef.object.setContributedChatSession({
             chatSessionResource: sessionResource
         });
@@ -565,10 +610,17 @@ let ChatService = class ChatService extends Disposable {
                 };
                 const agent = message.participant ?
                 this.chatAgentService.getAgent(message.participant) : this.chatAgentService.getAgent(chatSessionType);
+                const modeInfo = message.modeInstructions ? {
+                    kind: ChatModeKind.Agent,
+                    isBuiltin: message.modeInstructions.isBuiltin ?? false,
+                    modeInstructions: message.modeInstructions,
+                    modeId: "custom",
+                    applyCodeBlockSuggestionId: undefined
+                } : undefined;
                 lastRequest = model.addRequest(parsedRequest, message.variableData ?? {
                     variables: []
                 }, 0,
-                undefined, agent, undefined,
+                modeInfo, agent, undefined,
                 undefined,
                 undefined,
                 undefined,
@@ -585,14 +637,9 @@ let ChatService = class ChatService extends Disposable {
         if (providedSession.isCompleteObs?.get()) {
             lastRequest?.response?.complete();
         }
-        if (providedSession.progressObs && lastRequest && providedSession.interruptActiveResponseCallback) {
-            const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined, undefined, undefined);
-            this._pendingRequests.set(model.sessionResource, initialCancellationRequest);
-            this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
-                action: "add",
-                source: "remoteSession",
-                chatSessionId: chatSessionResourceToId(model.sessionResource)
-            });
+        const hasProgressStreaming = providedSession.progressObs && providedSession.interruptActiveResponseCallback;
+        if (hasProgressStreaming) {
+            let lastProgressLength = 0;
             const cancellationListener = disposables.add(( new MutableDisposable()));
             const createCancellationListener = token => {
                 return token.onCancellationRequested(() => {
@@ -610,19 +657,66 @@ let ChatService = class ChatService extends Disposable {
                     });
                 });
             };
-            cancellationListener.value = createCancellationListener(initialCancellationRequest.cancellationTokenSource.token);
-            let lastProgressLength = 0;
+            const ensureCancellationTracking = () => {
+                if (!( this._pendingRequests.has(model.sessionResource))) {
+                    const cts = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined, undefined, undefined);
+                    this._pendingRequests.set(model.sessionResource, cts);
+                    this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
+                        action: "add",
+                        source: "remoteSession",
+                        chatSessionId: chatSessionResourceToId(model.sessionResource)
+                    });
+                    cancellationListener.value = createCancellationListener(cts.cancellationTokenSource.token);
+                }
+            };
+            if (lastRequest) {
+                const initialCancellationRequest = this.instantiationService.createInstance(CancellableRequest, ( new CancellationTokenSource()), undefined, undefined, undefined);
+                this._pendingRequests.set(model.sessionResource, initialCancellationRequest);
+                this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
+                    action: "add",
+                    source: "remoteSession",
+                    chatSessionId: chatSessionResourceToId(model.sessionResource)
+                });
+                cancellationListener.value = createCancellationListener(initialCancellationRequest.cancellationTokenSource.token);
+            }
+            if (providedSession.onDidStartServerRequest) {
+                disposables.add(providedSession.onDidStartServerRequest((
+                    {
+                        prompt
+                    }
+                ) => {
+                    if (lastRequest?.response && !lastRequest.response.isComplete) {
+                        lastRequest.response.complete();
+                    }
+                    const requestText = prompt;
+                    const parsedRequest = {
+                        text: requestText,
+                        parts: [( new ChatRequestTextPart(( new OffsetRange(0, requestText.length)), {
+                            startLineNumber: 1,
+                            startColumn: 1,
+                            endLineNumber: 1,
+                            endColumn: requestText.length + 1
+                        }, requestText))]
+                    };
+                    const agent = this.chatAgentService.getAgent(chatSessionType);
+                    lastRequest = model.addRequest(parsedRequest, {
+                        variables: []
+                    }, 0, undefined, agent);
+                    lastProgressLength = 0;
+                    ensureCancellationTracking();
+                }));
+            }
             disposables.add(autorun(reader => {
                 const progressArray = providedSession.progressObs?.read(reader) ?? [];
                 const isComplete = providedSession.isCompleteObs?.read(reader) ?? false;
-                if (progressArray.length > lastProgressLength) {
+                if (lastRequest && progressArray.length > lastProgressLength) {
                     const newProgress = progressArray.slice(lastProgressLength);
                     for (const progress of newProgress) {
                         model?.acceptResponseProgress(lastRequest, progress);
                     }
                     lastProgressLength = progressArray.length;
                 }
-                if (isComplete) {
+                if (isComplete && lastRequest) {
                     lastRequest.response?.complete();
                     cancellationListener.clear();
                 }
@@ -883,6 +977,9 @@ let ChatService = class ChatService extends Disposable {
                 if (token.isCancellationRequested) {
                     return;
                 }
+                if (!gotProgress) {
+                    markChat(sessionResource, ChatPerfMark.FirstToken);
+                }
                 gotProgress = true;
                 for (let i = 0; i < progress.length; i++) {
                     const isLast = i === progress.length - 1;
@@ -932,7 +1029,7 @@ let ChatService = class ChatService extends Disposable {
                         model.acceptResponseProgress(request, {
                             kind: "markdownContent",
                             content: ( new MarkdownString(( localize(
-                                7201,
+                                7257,
                                 "The `{0}` skill requires the following settings to be enabled: {1}. After enabling, reload the window to apply. [Enable in Settings](command:workbench.action.openSettings?{2})",
                                 TROUBLESHOOT_COMMAND_NAME,
                                 missingSettings.join(", "),
@@ -1192,7 +1289,7 @@ let ChatService = class ChatService extends Disposable {
                         );
                         rawResult = {
                             errorDetails: {
-                                message: ( localize(7202, "Provider returned null response"))
+                                message: ( localize(7258, "Provider returned null response"))
                             }
                         };
                     }
@@ -1258,6 +1355,8 @@ let ChatService = class ChatService extends Disposable {
             chatSessionId: chatSessionResourceToId(model.sessionResource)
         });
         rawResponsePromise.finally(() => {
+            markChat(sessionResource, ChatPerfMark.RequestComplete);
+            clearChatMarks(sessionResource);
             if (this._pendingRequests.get(model.sessionResource) === cancellableRequest) {
                 this._pendingRequests.deleteAndDispose(model.sessionResource);
                 this.telemetryService.publicLog2(ChatPendingRequestChangeEventName, {
@@ -1289,7 +1388,13 @@ let ChatService = class ChatService extends Disposable {
             this.processNextPendingRequest(model);
         }
     }
+    _isServerManagedQueue(sessionResource) {
+        return sessionResource.scheme.startsWith("agent-host-");
+    }
     processNextPendingRequest(model) {
+        if (this._isServerManagedQueue(model.sessionResource)) {
+            return;
+        }
         const steeringRequests = model.dequeueAllSteeringRequests();
         const nextQueued = steeringRequests.length === 0 ? model.dequeuePendingRequest() : undefined;
         const allRequests = steeringRequests.length > 0 ? steeringRequests : (nextQueued ? [nextQueued] : []);
@@ -1428,7 +1533,8 @@ let ChatService = class ChatService extends Disposable {
                 command: request.response.slashCommand?.name,
                 variables: updateRanges(request.variableData, promptTextResult.diff),
                 location: ChatAgentLocation.Chat,
-                editedFileEvents: request.editedFileEvents
+                editedFileEvents: request.editedFileEvents,
+                modeInstructions: request.modeInfo?.modeInstructions
             };
             history.push({
                 request: historyRequest,
@@ -1652,46 +1758,19 @@ let ChatService = class ChatService extends Disposable {
         }
         return localSessionId;
     }
-    registerChatModelChangeListeners(chatSessionType, onChange) {
-        const disposableStore = ( new DisposableStore());
-        const chatModelsICareAbout = ( this.chatModels.map(
-            models => Array.from(models).filter(model => model.sessionResource.scheme === chatSessionType)
-        ));
-        const listeners = ( new ResourceMap());
-        const autoRunDisposable = autorunIterableDelta(reader => chatModelsICareAbout.read(reader), (
-            {
-                addedValues,
-                removedValues
-            }
-        ) => {
-            removedValues.forEach(removed => {
-                const listener = listeners.get(removed.sessionResource);
-                if (listener) {
-                    listeners.delete(removed.sessionResource);
-                    listener.dispose();
-                }
-            });
-            addedValues.forEach(added => {
-                const requestChangeListener = ( added.lastRequestObs.map(
-                    last => last?.response && observableSignalFromEvent("chatSessions.modelRequestChangeListener", last.response.onDidChange)
-                ));
-                const modelChangeListener = observableSignalFromEvent("chatSessions.modelChangeListener", added.onDidChange);
-                listeners.set(added.sessionResource, autorun(reader => {
-                    requestChangeListener.read(reader)?.read(reader);
-                    modelChangeListener.read(reader);
-                    onChange(added.sessionResource);
-                }));
-            });
-        });
-        disposableStore.add(toDisposable(() => {
-            for (const listener of ( listeners.values())) {
-                listener.dispose();
-            }
-        }));
-        disposableStore.add(autoRunDisposable);
-        return disposableStore;
-    }
 };
 ChatService = ( __decorate([( __param(0, IStorageService)), ( __param(1, ILogService)), ( __param(2, ITelemetryService)), ( __param(3, IExtensionService)), ( __param(4, IInstantiationService)), ( __param(5, IWorkspaceContextService)), ( __param(6, IChatSlashCommandService)), ( __param(7, IChatAgentService)), ( __param(8, IConfigurationService)), ( __param(9, IChatTransferService)), ( __param(10, IChatSessionsService)), ( __param(11, IMcpService)), ( __param(12, IPromptsService)), ( __param(13, IChatEntitlementService)), ( __param(14, ILanguageModelsService)), ( __param(15, IChatDebugService))], ChatService));
+async function chatModelToChatDetail(model) {
+    const title = model.title || ( localize(7259, "New Chat"));
+    return {
+        sessionResource: model.sessionResource,
+        title,
+        lastMessageDate: model.lastMessageDate,
+        timing: model.timing,
+        isActive: true,
+        stats: await awaitStatsForSession(model),
+        lastResponseState: model.lastRequest?.response?.state ?? ResponseModelState.Pending
+    };
+}
 
-export { ChatService };
+export { ChatService, chatModelToChatDetail };

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

@@ -18,8 +18,7 @@ let ChatServiceTelemetry = class ChatServiceTelemetry {
             this.telemetryService.publicLog2("interactiveSessionVote", {
                 direction: action.action.direction === ChatAgentVoteDirection.Up ? "up" : "down",
                 agentId: action.agentId ?? "",
-                command: action.command,
-                reason: action.action.reason
+                command: action.command
             });
         } else if (action.action.kind === "copy") {
             this.telemetryService.publicLog2("interactiveSessionCopy", {

package/vscode/src/vs/workbench/contrib/chat/common/model/chatSessionOperationLog.js

@@ -5,6 +5,7 @@ import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objec
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { hasKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { IChatRequestVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { serializeSendOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
@@ -37,6 +38,7 @@ const responsePartSchema = v(
             case "textEditGroup":
             case "multiDiffData":
             case "mcpServersStarting":
+            case "thinking":
                 return equals(a, b);
             case "clearToPreviousToolInvocation":
             case "codeblockUri":
@@ -50,7 +52,6 @@ const responsePartSchema = v(
             case "progressMessage":
             case "pullRequest":
             case "questionCarousel":
-            case "thinking":
             case "undoStop":
             case "warning":
             case "treeData":
@@ -81,7 +82,7 @@ const agentEditedFileEventSchema = object({
     eventKind: v(e => e.eventKind)
 });
 const chatVariableSchema = object({
-    variables: t(v => v.variables, array(value((a, b) => a.name === b.name)))
+    variables: t(v => ( v.variables.map(IChatRequestVariableEntry.toExport)), array(value((a, b) => a.name === b.name)))
 });
 const requestSchema = object({
     requestId: t(m => m.id, key()),
@@ -104,7 +105,6 @@ const requestSchema = object({
     followups: v(m => m.response?.followups, equals),
     modelState: v(m => m.response?.stateT, equals),
     vote: v(m => m.response?.vote),
-    voteDownReason: v(m => m.response?.voteDownReason),
     slashCommand: t(m => m.response?.slashCommand, value((a, b) => a?.name === b?.name)),
     usedContext: v(m => m.response?.usedContext, equals),
     contentReferences: v(m => m.response?.contentReferences, equals),
@@ -115,11 +115,12 @@ const requestSchema = object({
     sealed: o => o.modelState?.value === ResponseModelState.Cancelled || o.modelState?.value === ResponseModelState.Failed || o.modelState?.value === ResponseModelState.Complete
 });
 const inputStateSchema = object({
-    attachments: v(i => i.attachments, equals),
+    attachments: v(i => ( i.attachments.map(IChatRequestVariableEntry.toExport)), equals),
     mode: v(i => i.mode, (a, b) => a.id === b.id),
     selectedModel: v(i => i.selectedModel, (a, b) => a?.identifier === b?.identifier),
     inputText: v(i => i.inputText),
     selections: v(i => i.selections, equals),
+    permissionLevel: v(i => i.permissionLevel),
     contrib: v(i => i.contrib, equals)
 });
 const pendingRequestSchema = object({

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

@@ -13,7 +13,7 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IWorkspaceEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workspaces/common/workspaceEditing.service";
 import { IChatSessionStats, IChatSessionTiming, ResponseModelState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
-import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+import { ChatAgentLocation, ChatPermissionLevel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { ChatModel, ISerializableChatData, ISerializableChatsData, ISerializedChatDataReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 export declare class ChatSessionStore extends Disposable {
     private readonly fileService;
@@ -92,6 +92,10 @@ export interface IChatSessionEntryMetadata {
      * Whether this session was loaded from an external provider (eg background/cloud sessions).
      */
     isExternal?: boolean;
+    /**
+     * The permission level for tool auto-approval, if not default.
+     */
+    permissionLevel?: ChatPermissionLevel;
 }
 export type IChatSessionIndex = Record<string, IChatSessionEntryMetadata>;
 export interface IChatTransfer {