@codingame/monaco-vscode-chat-service-override 14.0.6 → 15.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.js

@@ -0,0 +1,78 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { PromptsConfig } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/config';
+import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
+import { isPromptFile } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/constants';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { appendToCommandPalette } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/files/browser/fileActions.contribution';
+import { isCodeEditor, isDiffEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
+import { KeybindingsRegistry, KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { ATTACH_PROMPT_ACTION_ID } from '../../actions/chatAttachPromptAction/chatAttachPromptAction.js';
+
+const COMMAND_ID = 'workbench.command.prompts.use';
+const COMMAND_KEY_BINDING = KeyMod.CtrlCmd | KeyCode.Slash | KeyMod.Alt;
+const command = async (accessor) => {
+    const commandService = accessor.get(ICommandService);
+    const viewsService = accessor.get(IViewsService);
+    const options = {
+        resource: getActivePromptUri(accessor),
+        widget: getFocusedChatWidget(accessor),
+        viewsService,
+    };
+    await commandService.executeCommand(ATTACH_PROMPT_ACTION_ID, options);
+};
+function getFocusedChatWidget(accessor) {
+    const chatWidgetService = accessor.get(IChatWidgetService);
+    const { lastFocusedWidget } = chatWidgetService;
+    if (!lastFocusedWidget) {
+        return undefined;
+    }
+    if (!lastFocusedWidget.hasInputFocus()) {
+        return undefined;
+    }
+    return lastFocusedWidget;
+}
+function getActiveCodeEditor(accessor) {
+    const editorService = accessor.get(IEditorService);
+    const { activeTextEditorControl } = editorService;
+    if (isCodeEditor(activeTextEditorControl) && activeTextEditorControl.hasModel()) {
+        return activeTextEditorControl;
+    }
+    if (isDiffEditor(activeTextEditorControl)) {
+        const originalEditor = activeTextEditorControl.getOriginalEditor();
+        if (!originalEditor.hasModel()) {
+            return undefined;
+        }
+        return originalEditor;
+    }
+    return undefined;
+}
+const getActivePromptUri = (accessor) => {
+    const activeEditor = getActiveCodeEditor(accessor);
+    if (!activeEditor) {
+        return undefined;
+    }
+    const { uri } = activeEditor.getModel();
+    if (isPromptFile(uri)) {
+        return uri;
+    }
+    return undefined;
+};
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: COMMAND_ID,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: COMMAND_KEY_BINDING,
+    handler: command,
+    when: PromptsConfig.enabledCtx,
+});
+appendToCommandPalette({
+    id: COMMAND_ID,
+    title: ( localize(4787, "Use Prompt")),
+    category: CHAT_CATEGORY,
+}, PromptsConfig.enabledCtx);
+
+export { COMMAND_ID, getActiveCodeEditor, getFocusedChatWidget };

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -8,12 +8,12 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { checkProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
+import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
 
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(4710, 'Contributes a welcome message to a chat view')),
+        description: ( localize(4791, 'Contributes a welcome message to a chat view')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -21,22 +21,22 @@ const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint
             properties: {
                 icon: {
                     type: 'string',
-                    description: ( localize(4711, 'The icon for the welcome message.')),
+                    description: ( localize(4792, 'The icon for the welcome message.')),
                 },
                 title: {
                     type: 'string',
-                    description: ( localize(4712, 'The title of the welcome message.')),
+                    description: ( localize(4793, 'The title of the welcome message.')),
                 },
                 content: {
                     type: 'string',
                     description: ( localize(
-                        4713,
+                        4794,
                         'The content of the welcome message. The first command link will be rendered as a button.'
                     )),
                 },
                 when: {
                     type: 'string',
-                    description: ( localize(4714, 'Condition when the welcome message is shown.')),
+                    description: ( localize(4795, 'Condition when the welcome message is shown.')),
                 }
             }
         },

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

@@ -2,9 +2,11 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { ICellEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service";
 export interface ICodeMapperResponse {
     textEdit: (resource: URI, textEdit: TextEdit[]) => void;
+    notebookEdit: (resource: URI, edit: ICellEditOperation[]) => void;
 }
 export interface ICodeMapperCodeBlock {
     readonly code: string;

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

@@ -0,0 +1,19 @@
+export declare enum ChatEntitlement {
+    Unknown = 1,
+    Unresolved = 2,
+    Available = 3,
+    Unavailable = 4,
+    Limited = 5,
+    Pro = 6
+}
+export interface IChatEntitlements {
+    readonly entitlement: ChatEntitlement;
+    readonly quotas?: IQuotas;
+}
+export interface IQuotas {
+    readonly chatTotal?: number;
+    readonly completionsTotal?: number;
+    readonly chatRemaining?: number;
+    readonly completionsRemaining?: number;
+    readonly resetDate?: string;
+}

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

@@ -0,0 +1,13 @@
+
+
+var ChatEntitlement;
+(function (ChatEntitlement) {
+    ChatEntitlement[ChatEntitlement["Unknown"] = 1] = "Unknown";
+    ChatEntitlement[ChatEntitlement["Unresolved"] = 2] = "Unresolved";
+    ChatEntitlement[ChatEntitlement["Available"] = 3] = "Available";
+    ChatEntitlement[ChatEntitlement["Unavailable"] = 4] = "Unavailable";
+    ChatEntitlement[ChatEntitlement["Limited"] = 5] = "Limited";
+    ChatEntitlement[ChatEntitlement["Pro"] = 6] = "Pro";
+})(ChatEntitlement || (ChatEntitlement = {}));
+
+export { ChatEntitlement };

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

@@ -1,24 +1,26 @@
 import { DeferredPromise } from "@codingame/monaco-vscode-api/vscode/vs/base/common/async";
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
-import { IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IToolConfirmationMessages } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IChatTerminalToolInvocationData, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 export declare class ChatToolInvocation implements IChatToolInvocation {
-    readonly invocationMessage: string | IMarkdownString;
-    readonly pastTenseMessage: string | IMarkdownString | undefined;
-    readonly tooltip: string | IMarkdownString | undefined;
-    private _confirmationMessages;
     readonly kind: "toolInvocation";
     private _isComplete;
     get isComplete(): boolean;
     private _isCompleteDeferred;
-    get isCompleteDeferred(): DeferredPromise<void>;
-    private _isCanceled;
-    get isCanceled(): boolean | undefined;
+    get isCompletePromise(): Promise<void>;
     private _confirmDeferred;
     get confirmed(): DeferredPromise<boolean>;
     private _isConfirmed;
     get isConfirmed(): boolean | undefined;
-    constructor(invocationMessage: string | IMarkdownString, pastTenseMessage: string | IMarkdownString | undefined, tooltip: string | IMarkdownString | undefined, _confirmationMessages: IToolConfirmationMessages | undefined);
+    private _resultDetails;
+    get resultDetails(): IToolResult["toolResultDetails"] | undefined;
+    readonly invocationMessage: string | IMarkdownString;
+    pastTenseMessage: string | IMarkdownString | undefined;
+    private _confirmationMessages;
+    readonly presentation: IPreparedToolInvocation["presentation"];
+    readonly toolSpecificData?: IChatTerminalToolInvocationData;
+    constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData);
+    complete(result: IToolResult | undefined): void;
     get confirmationMessages(): IToolConfirmationMessages | undefined;
     toJSON(): IChatToolInvocationSerialized;
 }

package/vscode/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.js

@@ -1,15 +1,13 @@
 
 import { DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 class ChatToolInvocation {
     get isComplete() {
         return this._isComplete;
     }
-    get isCompleteDeferred() {
-        return this._isCompleteDeferred;
-    }
-    get isCanceled() {
-        return this._isCanceled;
+    get isCompletePromise() {
+        return this._isCompleteDeferred.p;
     }
     get confirmed() {
         return this._confirmDeferred;
@@ -17,16 +15,22 @@ class ChatToolInvocation {
     get isConfirmed() {
         return this._isConfirmed;
     }
-    constructor(invocationMessage, pastTenseMessage, tooltip, _confirmationMessages) {
-        this.invocationMessage = invocationMessage;
-        this.pastTenseMessage = pastTenseMessage;
-        this.tooltip = tooltip;
-        this._confirmationMessages = _confirmationMessages;
+    get resultDetails() {
+        return this._resultDetails;
+    }
+    constructor(preparedInvocation, toolData) {
         this.kind = 'toolInvocation';
         this._isComplete = false;
         this._isCompleteDeferred = ( new DeferredPromise());
         this._confirmDeferred = ( new DeferredPromise());
-        if (!_confirmationMessages) {
+        const defaultMessage = ( localize(4842, "Using {0}", `"${toolData.displayName}"`));
+        const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
+        this.invocationMessage = invocationMessage;
+        this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
+        this._confirmationMessages = preparedInvocation?.confirmationMessages;
+        this.presentation = preparedInvocation?.presentation;
+        this.toolSpecificData = preparedInvocation?.toolSpecificData;
+        if (!this._confirmationMessages) {
             this._isConfirmed = true;
             this._confirmDeferred.complete(true);
         }
@@ -38,17 +42,26 @@ class ChatToolInvocation {
             this._isComplete = true;
         });
     }
+    complete(result) {
+        if (result?.toolResultMessage) {
+            this.pastTenseMessage = result.toolResultMessage;
+        }
+        this._resultDetails = result?.toolResultDetails;
+        this._isCompleteDeferred.complete();
+    }
     get confirmationMessages() {
         return this._confirmationMessages;
     }
     toJSON() {
         return {
             kind: 'toolInvocationSerialized',
+            presentation: this.presentation,
             invocationMessage: this.invocationMessage,
             pastTenseMessage: this.pastTenseMessage,
-            tooltip: this.tooltip,
-            isConfirmed: this._isConfirmed ?? false,
+            isConfirmed: this._isConfirmed,
             isComplete: this._isComplete,
+            resultDetails: this._resultDetails,
+            toolSpecificData: this.toolSpecificData,
         };
     }
 }

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

@@ -0,0 +1,31 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IChatQuotasService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatQuotasService.service";
+export interface IChatQuotas {
+    chatQuotaExceeded: boolean;
+    completionsQuotaExceeded: boolean;
+    quotaResetDate: Date | undefined;
+    chatTotal?: number;
+    completionsTotal?: number;
+    chatRemaining?: number;
+    completionsRemaining?: number;
+}
+export declare class ChatQuotasService extends Disposable implements IChatQuotasService {
+    private readonly contextKeyService;
+    _serviceBrand: undefined;
+    private readonly _onDidChangeQuotaExceeded;
+    readonly onDidChangeQuotaExceeded: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    private readonly _onDidChangeQuotaRemaining;
+    readonly onDidChangeQuotaRemaining: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    private _quotas;
+    get quotas(): IChatQuotas;
+    private readonly chatQuotaExceededContextKey;
+    private readonly completionsQuotaExceededContextKey;
+    private ExtensionQuotaContextKeys;
+    constructor(contextKeyService: IContextKeyService);
+    private registerListeners;
+    acceptQuotas(quotas: IChatQuotas): void;
+    private massageQuotas;
+    clearQuotas(): void;
+    private updateContextKeys;
+}

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

@@ -0,0 +1,85 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+
+let ChatQuotasService = class ChatQuotasService extends Disposable {
+    get quotas() { return this._quotas; }
+    constructor(contextKeyService) {
+        super();
+        this.contextKeyService = contextKeyService;
+        this._onDidChangeQuotaExceeded = this._register(( new Emitter()));
+        this.onDidChangeQuotaExceeded = this._onDidChangeQuotaExceeded.event;
+        this._onDidChangeQuotaRemaining = this._register(( new Emitter()));
+        this.onDidChangeQuotaRemaining = this._onDidChangeQuotaRemaining.event;
+        this._quotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined };
+        this.chatQuotaExceededContextKey = ChatContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
+        this.completionsQuotaExceededContextKey = ChatContextKeys.completionsQuotaExceeded.bindTo(this.contextKeyService);
+        this.ExtensionQuotaContextKeys = {
+            chatQuotaExceeded: 'github.copilot.chat.quotaExceeded',
+            completionsQuotaExceeded: 'github.copilot.completions.quotaExceeded',
+        };
+        this.registerListeners();
+    }
+    registerListeners() {
+        const chatQuotaExceededSet = ( new Set([this.ExtensionQuotaContextKeys.chatQuotaExceeded]));
+        const completionsQuotaExceededSet = ( new Set([this.ExtensionQuotaContextKeys.completionsQuotaExceeded]));
+        this._register(this.contextKeyService.onDidChangeContext(e => {
+            let changed = false;
+            if (e.affectsSome(chatQuotaExceededSet)) {
+                const newChatQuotaExceeded = this.contextKeyService.getContextKeyValue(this.ExtensionQuotaContextKeys.chatQuotaExceeded);
+                if (typeof newChatQuotaExceeded === 'boolean' && newChatQuotaExceeded !== this._quotas.chatQuotaExceeded) {
+                    this._quotas.chatQuotaExceeded = newChatQuotaExceeded;
+                    changed = true;
+                }
+            }
+            if (e.affectsSome(completionsQuotaExceededSet)) {
+                const newCompletionsQuotaExceeded = this.contextKeyService.getContextKeyValue(this.ExtensionQuotaContextKeys.completionsQuotaExceeded);
+                if (typeof newCompletionsQuotaExceeded === 'boolean' && newCompletionsQuotaExceeded !== this._quotas.completionsQuotaExceeded) {
+                    this._quotas.completionsQuotaExceeded = newCompletionsQuotaExceeded;
+                    changed = true;
+                }
+            }
+            if (changed) {
+                this.updateContextKeys();
+                this._onDidChangeQuotaExceeded.fire();
+            }
+        }));
+    }
+    acceptQuotas(quotas) {
+        const oldQuota = this._quotas;
+        this._quotas = this.massageQuotas(quotas);
+        this.updateContextKeys();
+        if (oldQuota.chatQuotaExceeded !== this._quotas.chatQuotaExceeded ||
+            oldQuota.completionsQuotaExceeded !== this._quotas.completionsQuotaExceeded) {
+            this._onDidChangeQuotaExceeded.fire();
+        }
+        if (oldQuota.chatRemaining !== this._quotas.chatRemaining ||
+            oldQuota.completionsRemaining !== this._quotas.completionsRemaining) {
+            this._onDidChangeQuotaRemaining.fire();
+        }
+    }
+    massageQuotas(quotas) {
+        return {
+            ...quotas,
+            chatRemaining: typeof quotas.chatRemaining === 'number' ? Math.max(0, quotas.chatRemaining) : undefined,
+            completionsRemaining: typeof quotas.completionsRemaining === 'number' ? Math.max(0, quotas.completionsRemaining) : undefined
+        };
+    }
+    clearQuotas() {
+        if (this.quotas.chatQuotaExceeded || this.quotas.completionsQuotaExceeded) {
+            this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined });
+        }
+    }
+    updateContextKeys() {
+        this.chatQuotaExceededContextKey.set(this._quotas.chatQuotaExceeded);
+        this.completionsQuotaExceededContextKey.set(this._quotas.completionsQuotaExceeded);
+    }
+};
+ChatQuotasService = ( __decorate([
+    ( __param(0, IContextKeyService))
+], ChatQuotasService));
+
+export { ChatQuotasService };

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

@@ -12,8 +12,8 @@ import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IChatCompleteResponse, IChatDetail, IChatSendRequestData, IChatSendRequestOptions, IChatTransferredSessionData, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service";
@@ -37,6 +37,10 @@ export declare class ChatService extends Disposable implements IChatService {
     private _deletedChatIds;
     private _transferredSessionData;
     get transferredSessionData(): IChatTransferredSessionData | undefined;
+    private readonly _onDidSubmitRequest;
+    readonly onDidSubmitRequest: Event<{
+        chatSessionId: string;
+    }>;
     private readonly _onDidPerformUserAction;
     readonly onDidPerformUserAction: Event<IChatUserActionEvent>;
     private readonly _onDidDisposeSession;

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

@@ -25,9 +25,9 @@ import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { normalizeSerializableChatData, ChatModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent, ChatRequestModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, chatSubcommandLeader, chatAgentLeader, ChatRequestSlashCommandPart, getPromptText } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
@@ -77,6 +77,8 @@ let ChatService = class ChatService extends Disposable {
         this._sessionModels = this._register(( new DisposableMap()));
         this._pendingRequests = this._register(( new DisposableMap()));
         this._deletedChatIds = ( new Set());
+        this._onDidSubmitRequest = this._register(( new Emitter()));
+        this.onDidSubmitRequest = this._onDidSubmitRequest.event;
         this._onDidPerformUserAction = this._register(( new Emitter()));
         this.onDidPerformUserAction = this._onDidPerformUserAction.event;
         this._onDidDisposeSession = this._register(( new Emitter()));
@@ -100,7 +102,12 @@ let ChatService = class ChatService extends Disposable {
         if (transferredChat) {
             this.trace('constructor', `Transferred session ${transferredChat.sessionId}`);
             this._persistedSessions[transferredChat.sessionId] = transferredChat;
-            this._transferredSessionData = { sessionId: transferredChat.sessionId, inputValue: transferredData.inputValue };
+            this._transferredSessionData = {
+                sessionId: transferredChat.sessionId,
+                inputValue: transferredData.inputValue,
+                location: transferredData.location,
+                toolsAgentModeEnabled: transferredData.toolsAgentModeEnabled,
+            };
         }
         this._register(storageService.onWillSaveState(() => this.saveState()));
     }
@@ -256,7 +263,7 @@ let ChatService = class ChatService extends Disposable {
         const liveSessionItems = ( Array.from(( this._sessionModels.values()))
             .filter(session => !session.isImported && session.initialLocation !== ChatAgentLocation.EditingSession)
             .map(session => {
-            const title = session.title || ( localize(4758, "New Chat"));
+            const title = session.title || ( localize(4843, "New Chat"));
             return {
                 sessionId: session.sessionId,
                 title,
@@ -326,10 +333,13 @@ let ChatService = class ChatService extends Disposable {
         if (!sessionData) {
             return undefined;
         }
-        if (sessionId === this.transferredSessionData?.sessionId) {
+        const session = this._startSession(sessionData, sessionData.initialLocation ?? ChatAgentLocation.Panel, CancellationToken.None);
+        const isTransferred = this.transferredSessionData?.sessionId === sessionId;
+        if (isTransferred) {
+            this.chatAgentService.toggleToolsAgentMode(this.transferredSessionData.toolsAgentModeEnabled);
             this._transferredSessionData = undefined;
         }
-        return this._startSession(sessionData, sessionData.initialLocation ?? ChatAgentLocation.Panel, CancellationToken.None);
+        return session;
     }
     loadSessionFromContent(data) {
         return this._startSession(data, data.initialLocation ?? ChatAgentLocation.Panel, CancellationToken.None);
@@ -354,7 +364,6 @@ let ChatService = class ChatService extends Disposable {
             ...options,
             locationData: request.locationData,
             attachedContext: request.attachedContext,
-            workingSet: request.workingSet,
             hasInstructionAttachments: options?.hasInstructionAttachments ?? false,
         };
         await this._sendRequestAsync(model, model.sessionId, request.message, attempt, enableCommandDetection, defaultAgent, location, resendOptions).responseCompletePromise;
@@ -381,7 +390,12 @@ let ChatService = class ChatService extends Disposable {
         for (let i = requests.length - 1; i >= 0; i -= 1) {
             const request = requests[i];
             if (request.shouldBeRemovedOnSend) {
-                this.removeRequest(sessionId, request.id);
+                if (request.shouldBeRemovedOnSend.afterUndoStop) {
+                    request.response?.finalizeUndoState();
+                }
+                else {
+                    this.removeRequest(sessionId, request.id);
+                }
             }
         }
         const location = options?.location ?? model.initialLocation;
@@ -480,7 +494,7 @@ let ChatService = class ChatService extends Disposable {
                 if (agentPart || (defaultAgent && !commandPart)) {
                     const prepareChatAgentRequest = async (agent, command, enableCommandDetection, chatRequest, isParticipantDetected) => {
                         const initVariableData = { variables: [] };
-                        request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, agent, command, options?.confirmation, options?.locationData, options?.attachedContext, options?.workingSet);
+                        request = chatRequest ?? model.addRequest(parsedRequest, initVariableData, attempt, agent, command, options?.confirmation, options?.locationData, options?.attachedContext);
                         let variableData;
                         let message;
                         if (chatRequest) {
@@ -488,12 +502,7 @@ let ChatService = class ChatService extends Disposable {
                             message = getPromptText(request.message).message;
                         }
                         else {
-                            variableData = await this.chatVariablesService.resolveVariables(parsedRequest, request.attachedContext, model, progressCallback, token);
-                            for (const variable of variableData.variables) {
-                                if (request.workingSet && variable.isFile && URI.isUri(variable.value)) {
-                                    request.workingSet.push(variable.value);
-                                }
-                            }
+                            variableData = this.chatVariablesService.resolveVariables(parsedRequest, request.attachedContext);
                             model.updateRequest(request, variableData);
                             const promptTextResult = getPromptText(request.message);
                             variableData = updateRanges(variableData, promptTextResult.diff);
@@ -516,9 +525,9 @@ let ChatService = class ChatService extends Disposable {
                             userSelectedModelId: options?.userSelectedModelId
                         };
                     };
-                    if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && enableCommandDetection) {
+                    if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && !agentSlashCommandPart && enableCommandDetection) {
                         const defaultAgentHistory = this.getHistoryEntriesFromModel(requests, model.sessionId, location, defaultAgent.id);
-                        const chatAgentRequest = await prepareChatAgentRequest(defaultAgent, agentSlashCommandPart?.command, enableCommandDetection, undefined, false);
+                        const chatAgentRequest = await prepareChatAgentRequest(defaultAgent, undefined, enableCommandDetection, undefined, false);
                         const result = await this.chatAgentService.detectAgentOrCommand(chatAgentRequest, defaultAgentHistory, { location }, token);
                         if (result && this.chatAgentService.getAgent(result.agent.id)?.locations?.includes(location)) {
                             request.response?.setAgent(result.agent, result.command);
@@ -569,7 +578,7 @@ let ChatService = class ChatService extends Disposable {
                 else {
                     if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-                        rawResult = { errorDetails: { message: ( localize(4759, "Provider returned null response")) } };
+                        rawResult = { errorDetails: { message: ( localize(4844, "Provider returned null response")) } };
                     }
                     const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
                         rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
@@ -644,6 +653,7 @@ let ChatService = class ChatService extends Disposable {
         rawResponsePromise.finally(() => {
             this._pendingRequests.deleteAndDispose(model.sessionId);
         });
+        this._onDidSubmitRequest.fire({ chatSessionId: model.sessionId });
         return {
             responseCreatedPromise: responseCreated.p,
             responseCompletePromise: rawResponsePromise,
@@ -666,11 +676,8 @@ let ChatService = class ChatService extends Disposable {
                 if (v.isTool) {
                     return 'toolInPrompt';
                 }
-                else if (v.isDynamic) {
-                    return 'fileInPrompt';
-                }
                 else {
-                    return 'variableInPrompt';
+                    return 'fileInPrompt';
                 }
             }
             else if (v.kind === 'command') {
@@ -688,7 +695,7 @@ let ChatService = class ChatService extends Disposable {
             else if (v.isTool) {
                 return 'tool';
             }
-            else if (v.isDynamic) {
+            else {
                 if (URI.isUri(v.value)) {
                     return 'file';
                 }
@@ -699,9 +706,6 @@ let ChatService = class ChatService extends Disposable {
                     return 'otherAttachment';
                 }
             }
-            else {
-                return 'variableAttachment';
-            }
         }));
     }
     getHistoryEntriesFromModel(requests, sessionId, location, forAgentId) {
@@ -822,6 +826,8 @@ let ChatService = class ChatService extends Disposable {
             timestampInMilliseconds: Date.now(),
             toWorkspace: toWorkspace,
             inputValue: transferredSessionData.inputValue,
+            location: transferredSessionData.location,
+            toolsAgentModeEnabled: transferredSessionData.toolsAgentModeEnabled,
         });
         this.storageService.store(globalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
         this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${( toWorkspace.toString())}`);

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

@@ -1,6 +1,5 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ChatAgentVoteDirection, ChatCopyKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 
@@ -40,15 +39,6 @@ let ChatServiceTelemetry = class ChatServiceTelemetry {
                 editsProposed: !!action.action.editsProposed,
             });
         }
-        else if (action.action.kind === 'command') {
-            const command = CommandsRegistry.getCommand(action.action.commandButton.command.id);
-            const commandId = command ? action.action.commandButton.command.id : 'INVALID';
-            this.telemetryService.publicLog2('interactiveSessionCommand', {
-                commandId,
-                agentId: action.agentId ?? '',
-                command: action.command,
-            });
-        }
         else if (action.action.kind === 'runInTerminal') {
             this.telemetryService.publicLog2('interactiveSessionRunInTerminal', {
                 languageId: action.action.languageId ?? '',

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

@@ -0,0 +1,4 @@
+export declare const DOCUMENTATION_URL = "https://aka.ms/vscode-ghcp-prompt-snippets";
+export declare const LANGUAGE_SELECTOR: Readonly<{
+    pattern: "**/*.prompt.md";
+}>;

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

@@ -0,0 +1,9 @@
+
+import { PROMPT_FILE_EXTENSION } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/constants';
+
+const DOCUMENTATION_URL = 'https://aka.ms/vscode-ghcp-prompt-snippets';
+const LANGUAGE_SELECTOR = ( Object.freeze({
+    pattern: `**/*${PROMPT_FILE_EXTENSION}`,
+}));
+
+export { DOCUMENTATION_URL, LANGUAGE_SELECTOR };