@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -12,72 +12,64 @@ let ChatServiceTelemetry = class ChatServiceTelemetry {
         this.telemetryService = telemetryService;
     }
     notifyUserAction(action) {
-        if (action.action.kind === 'vote') {
-            this.telemetryService.publicLog2('interactiveSessionVote', {
-                direction: action.action.direction === ChatAgentVoteDirection.Up ? 'up' : 'down',
-                agentId: action.agentId ?? '',
+        if (action.action.kind === "vote") {
+            this.telemetryService.publicLog2("interactiveSessionVote", {
+                direction: action.action.direction === ChatAgentVoteDirection.Up ? "up" : "down",
+                agentId: action.agentId ?? "",
                 command: action.command,
-                reason: action.action.reason,
+                reason: action.action.reason
             });
-        }
-        else if (action.action.kind === 'copy') {
-            this.telemetryService.publicLog2('interactiveSessionCopy', {
-                copyKind: action.action.copyKind === ChatCopyKind.Action ? 'action' : 'toolbar',
-                agentId: action.agentId ?? '',
-                command: action.command,
+        } else if (action.action.kind === "copy") {
+            this.telemetryService.publicLog2("interactiveSessionCopy", {
+                copyKind: action.action.copyKind === ChatCopyKind.Action ? "action" : "toolbar",
+                agentId: action.agentId ?? "",
+                command: action.command
             });
-        }
-        else if (action.action.kind === 'insert') {
-            this.telemetryService.publicLog2('interactiveSessionInsert', {
+        } else if (action.action.kind === "insert") {
+            this.telemetryService.publicLog2("interactiveSessionInsert", {
                 newFile: !!action.action.newFile,
-                agentId: action.agentId ?? '',
-                command: action.command,
+                agentId: action.agentId ?? "",
+                command: action.command
             });
-        }
-        else if (action.action.kind === 'apply') {
-            this.telemetryService.publicLog2('interactiveSessionApply', {
+        } else if (action.action.kind === "apply") {
+            this.telemetryService.publicLog2("interactiveSessionApply", {
                 newFile: !!action.action.newFile,
                 codeMapper: action.action.codeMapper,
-                agentId: action.agentId ?? '',
+                agentId: action.agentId ?? "",
                 command: action.command,
-                editsProposed: !!action.action.editsProposed,
+                editsProposed: !!action.action.editsProposed
             });
-        }
-        else if (action.action.kind === 'runInTerminal') {
-            this.telemetryService.publicLog2('interactiveSessionRunInTerminal', {
-                languageId: action.action.languageId ?? '',
-                agentId: action.agentId ?? '',
-                command: action.command,
+        } else if (action.action.kind === "runInTerminal") {
+            this.telemetryService.publicLog2("interactiveSessionRunInTerminal", {
+                languageId: action.action.languageId ?? "",
+                agentId: action.agentId ?? "",
+                command: action.command
             });
-        }
-        else if (action.action.kind === 'followUp') {
-            this.telemetryService.publicLog2('chatFollowupClicked', {
-                agentId: action.agentId ?? '',
-                command: action.command,
+        } else if (action.action.kind === "followUp") {
+            this.telemetryService.publicLog2("chatFollowupClicked", {
+                agentId: action.agentId ?? "",
+                command: action.command
             });
-        }
-        else if (action.action.kind === 'chatEditingHunkAction') {
-            this.telemetryService.publicLog2('chatEditHunk', {
-                agentId: action.agentId ?? '',
+        } else if (action.action.kind === "chatEditingHunkAction") {
+            this.telemetryService.publicLog2("chatEditHunk", {
+                agentId: action.agentId ?? "",
                 outcome: action.action.outcome,
                 lineCount: action.action.lineCount,
-                hasRemainingEdits: action.action.hasRemainingEdits,
+                hasRemainingEdits: action.action.hasRemainingEdits
             });
         }
     }
     retrievedFollowups(agentId, command, numFollowups) {
-        this.telemetryService.publicLog2('chatFollowupsRetrieved', {
+        this.telemetryService.publicLog2("chatFollowupsRetrieved", {
             agentId,
             command,
-            numFollowups,
+            numFollowups
         });
     }
 };
-ChatServiceTelemetry = ( __decorate([
-    ( __param(0, ITelemetryService))
-], ChatServiceTelemetry));
+ChatServiceTelemetry = ( __decorate([( __param(0, ITelemetryService))], ChatServiceTelemetry));
 function getCodeBlocks(text) {
-    const lines = text.split('\n');
+    const lines = text.split("\n");
     const codeBlockLanguages = [];
     let codeBlockState;
     for (let i = 0; i < lines.length; i++) {
@@ -87,11 +79,13 @@ function getCodeBlocks(text) {
                 codeBlockLanguages.push(codeBlockState.languageId);
                 codeBlockState = undefined;
             }
-        }
-        else {
+        } else {
             const match = line.match(/^(\s*)(`{3,}|~{3,})(\w*)/);
             if (match) {
-                codeBlockState = { delimiter: match[2], languageId: match[3] };
+                codeBlockState = {
+                    delimiter: match[2],
+                    languageId: match[3]
+                };
             }
         }
     }
@@ -104,12 +98,21 @@ let ChatRequestTelemetry = class ChatRequestTelemetry {
         this.languageModelsService = languageModelsService;
         this.isComplete = false;
     }
-    complete({ timeToFirstProgress, totalTime, result, requestType, request, detectedAgent }) {
+    complete(
+        {
+            timeToFirstProgress,
+            totalTime,
+            result,
+            requestType,
+            request,
+            detectedAgent
+        }
+    ) {
         if (this.isComplete) {
             return;
         }
         this.isComplete = true;
-        this.telemetryService.publicLog2('interactiveSessionProviderInvoked', {
+        this.telemetryService.publicLog2("interactiveSessionProviderInvoked", {
             timeToFirstProgress,
             totalTime,
             result,
@@ -122,54 +125,42 @@ let ChatRequestTelemetry = class ChatRequestTelemetry {
             isParticipantDetected: !!detectedAgent,
             location: this.opts.location,
             citations: request.response?.codeCitations.length ?? 0,
-            numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? '').length,
+            numCodeBlocks: getCodeBlocks(request.response?.response.toString() ?? "").length,
             attachmentKinds: this.attachmentKindsForTelemetry(request.variableData),
-            model: this.resolveModelId(this.opts.options?.userSelectedModelId),
+            model: this.resolveModelId(this.opts.options?.userSelectedModelId)
         });
     }
     attachmentKindsForTelemetry(variableData) {
         return ( variableData.variables.map(v => {
-            if (v.kind === 'implicit') {
-                return 'implicit';
-            }
-            else if (v.range) {
-                if (v.kind === 'tool') {
-                    return 'toolInPrompt';
-                }
-                else if (v.kind === 'toolset') {
-                    return 'toolsetInPrompt';
+            if (v.kind === "implicit") {
+                return "implicit";
+            } else if (v.range) {
+                if (v.kind === "tool") {
+                    return "toolInPrompt";
+                } else if (v.kind === "toolset") {
+                    return "toolsetInPrompt";
+                } else {
+                    return "fileInPrompt";
                 }
-                else {
-                    return 'fileInPrompt';
-                }
-            }
-            else if (v.kind === 'command') {
-                return 'command';
-            }
-            else if (v.kind === 'symbol') {
-                return 'symbol';
-            }
-            else if (isImageVariableEntry(v)) {
-                return 'image';
-            }
-            else if (v.kind === 'directory') {
-                return 'directory';
-            }
-            else if (v.kind === 'tool') {
-                return 'tool';
-            }
-            else if (v.kind === 'toolset') {
-                return 'toolset';
-            }
-            else {
+            } else if (v.kind === "command") {
+                return "command";
+            } else if (v.kind === "symbol") {
+                return "symbol";
+            } else if (isImageVariableEntry(v)) {
+                return "image";
+            } else if (v.kind === "directory") {
+                return "directory";
+            } else if (v.kind === "tool") {
+                return "tool";
+            } else if (v.kind === "toolset") {
+                return "toolset";
+            } else {
                 if (URI.isUri(v.value)) {
-                    return 'file';
-                }
-                else if (isLocation(v.value)) {
-                    return 'location';
-                }
-                else {
-                    return 'otherAttachment';
+                    return "file";
+                } else if (isLocation(v.value)) {
+                    return "location";
+                } else {
+                    return "otherAttachment";
                 }
             }
         }));
@@ -178,9 +169,6 @@ let ChatRequestTelemetry = class ChatRequestTelemetry {
         return userSelectedModelId && this.languageModelsService.lookupLanguageModel(userSelectedModelId)?.id;
     }
 };
-ChatRequestTelemetry = ( __decorate([
-    ( __param(1, ITelemetryService)),
-    ( __param(2, ILanguageModelsService))
-], ChatRequestTelemetry));
+ChatRequestTelemetry = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, ILanguageModelsService))], ChatRequestTelemetry));
 
 export { ChatRequestTelemetry, ChatServiceTelemetry };

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

@@ -7,9 +7,7 @@ class LanguageModelIgnoredFilesService {
     }
     async fileIsIgnored(uri, token) {
         const provider = ( this._providers.values()).next().value;
-        return provider ?
-            provider.isFileIgnored(uri, token) :
-            false;
+        return provider ? provider.isFileIgnored(uri, token) : false;
     }
     registerIgnoredFileProvider(provider) {
         this._providers.add(provider);

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

@@ -1,11 +1,11 @@
 import { IDisposable, IReference, ReferenceCollection } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
-import { ChatModel, IExportableChatData, ISerializableChatData, ISerializableChatModelInputState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { ChatModel, ISerializableChatModelInputState, ISerializedChatDataReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 export interface IStartSessionProps {
-    readonly initialData?: IExportableChatData | ISerializableChatData;
+    readonly initialData?: ISerializedChatDataReference;
     readonly location: ChatAgentLocation;
     readonly sessionResource: URI;
     readonly sessionId?: string;
@@ -27,6 +27,8 @@ export declare class ChatModelStore extends ReferenceCollection<ChatModel> imple
     private readonly _pendingDisposals;
     private readonly _onDidDisposeModel;
     readonly onDidDisposeModel: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<ChatModel>;
+    private readonly _onDidCreateModel;
+    readonly onDidCreateModel: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<ChatModel>;
     constructor(delegate: ChatModelStoreDelegate, logService: ILogService);
     get observable(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<Map<string, ChatModel>>;
     values(): Iterable<ChatModel>;

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

@@ -17,6 +17,8 @@ let ChatModelStore = class ChatModelStore extends ReferenceCollection {
         this._pendingDisposals = ( new Set());
         this._onDidDisposeModel = this._store.add(( new Emitter()));
         this.onDidDisposeModel = this._onDidDisposeModel.event;
+        this._onDidCreateModel = this._store.add(( new Emitter()));
+        this.onDidCreateModel = this._onDidCreateModel.event;
     }
     get observable() {
         return this._models.observable;
@@ -55,6 +57,7 @@ let ChatModelStore = class ChatModelStore extends ReferenceCollection {
             throw ( new Error(`Chat session key mismatch for ${key}`));
         }
         this._models.set(key, model);
+        this._onDidCreateModel.fire(model);
         return model;
     }
     destroyReferencedObject(key, object) {
@@ -68,11 +71,9 @@ let ChatModelStore = class ChatModelStore extends ReferenceCollection {
     async doDestroyReferencedObject(key, object) {
         try {
             await this.delegate.willDisposeModel(object);
-        }
-        catch (error) {
+        } catch (error) {
             this.logService.error(error);
-        }
-        finally {
+        } finally {
             if (( this._modelsToDispose.has(key))) {
                 this.logService.trace(`Disposing chat session ${key}`);
                 this._models.delete(key);
@@ -93,8 +94,6 @@ let ChatModelStore = class ChatModelStore extends ReferenceCollection {
         this._models.forEach(model => model.dispose());
     }
 };
-ChatModelStore = ( __decorate([
-    ( __param(1, ILogService))
-], ChatModelStore));
+ChatModelStore = ( __decorate([( __param(1, ILogService))], ChatModelStore));
 
 export { ChatModelStore };

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

@@ -1,25 +1,53 @@
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { IChatExtensionsContent, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { ConfirmedReason, IChatExtensionsContent, IChatSubagentToolInvocationData, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult, ToolDataSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
+export interface IStreamingToolCallOptions {
+    toolCallId: string;
+    toolId: string;
+    toolData: IToolData;
+    subagentInvocationId?: string;
+    chatRequestId?: string;
+}
 export declare class ChatToolInvocation implements IChatToolInvocation {
     readonly toolCallId: string;
     readonly kind: "toolInvocation";
-    readonly invocationMessage: string | IMarkdownString;
+    invocationMessage: string | IMarkdownString;
     readonly originMessage: string | IMarkdownString | undefined;
     pastTenseMessage: string | IMarkdownString | undefined;
     confirmationMessages: IToolConfirmationMessages | undefined;
-    readonly presentation: IPreparedToolInvocation["presentation"];
+    presentation: IPreparedToolInvocation["presentation"];
     readonly toolId: string;
-    readonly source: ToolDataSource;
-    readonly fromSubAgent: boolean | undefined;
-    readonly parameters: unknown;
+    source: ToolDataSource;
+    readonly subAgentInvocationId: string | undefined;
+    parameters: unknown;
     generatedTitle?: string;
-    readonly toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
+    readonly chatRequestId?: string;
+    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent | IChatSubagentToolInvocationData;
     private readonly _progress;
     private readonly _state;
+    private readonly _partialInput;
+    private readonly _streamingMessage;
     get state(): IObservable<IChatToolInvocation.State>;
-    constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData, toolCallId: string, fromSubAgent: boolean | undefined, parameters: unknown);
+    /**
+     * Create a tool invocation in streaming state.
+     * Use this when the tool call is beginning to stream partial input from the LM.
+     */
+    static createStreaming(options: IStreamingToolCallOptions): ChatToolInvocation;
+    constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData, toolCallId: string, subAgentInvocationId: string | undefined, parameters: unknown, isStreaming?: boolean, chatRequestId?: string);
+    /**
+     * Update the partial input observable during streaming.
+     */
+    updatePartialInput(input: unknown): void;
+    /**
+     * Update the streaming message (from handleToolStream).
+     */
+    updateStreamingMessage(message: string | IMarkdownString): void;
+    /**
+     * Transition from streaming state to prepared/executing state.
+     * Called when the full tool call is ready.
+     */
+    transitionFromStreaming(preparedInvocation: IPreparedToolInvocation | undefined, parameters: unknown, autoConfirmed: ConfirmedReason | undefined): void;
     private _setCompleted;
     didExecuteTool(result: IToolResult | undefined, final?: boolean): IChatToolInvocation.State;
     acceptProgress(step: IToolProgressStep): void;