@codingame/monaco-vscode-chat-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatVariables.d.ts

@@ -0,0 +1,26 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { Location } from "vscode/vscode/vs/editor/common/languages";
+import { IViewsService } from "vscode/vscode/vs/workbench/services/views/common/viewsService.service";
+import { ChatAgentLocation } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolver, IChatVariableResolverProgress, IDynamicVariable } from "vscode/vscode/vs/workbench/contrib/chat/common/chatVariables";
+import { IChatVariablesService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service";
+import { IChatWidgetService } from "vscode/vscode/vs/workbench/contrib/chat/browser/chat.service";
+export declare class ChatVariablesService implements IChatVariablesService {
+    private readonly chatWidgetService;
+    private readonly viewsService;
+    _serviceBrand: undefined;
+    private _resolver;
+    constructor(chatWidgetService: IChatWidgetService, viewsService: IViewsService);
+    resolveVariables(prompt: IParsedChatRequest, attachedContextVariables: IChatRequestVariableEntry[] | undefined, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableData>;
+    resolveVariable(variableName: string, promptText: string, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableValue | undefined>;
+    hasVariable(name: string): boolean;
+    getVariable(name: string): IChatVariableData | undefined;
+    getVariables(location: ChatAgentLocation): Iterable<Readonly<IChatVariableData>>;
+    getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>;
+    registerVariable(data: IChatVariableData, resolver: IChatVariableResolver): IDisposable;
+    attachContext(name: string, value: string | URI | Location, location: ChatAgentLocation): Promise<void>;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/chatVariables.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { onUnexpectedExternalError } from 'vscode/vscode/vs/base/common/errors';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
@@ -7,10 +8,10 @@ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { showEditsView, showChatView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 
 let ChatVariablesService = class ChatVariablesService {
     constructor(chatWidgetService, viewsService) {
@@ -120,10 +121,12 @@ let ChatVariablesService = class ChatVariablesService {
         });
     }
     async attachContext(name, value, location) {
-        if (location !== ChatAgentLocation.Panel) {
+        if (location !== ChatAgentLocation.Panel && location !== ChatAgentLocation.EditingSession) {
             return;
         }
-        const widget = this.chatWidgetService.lastFocusedWidget ?? (await showChatView(this.viewsService));
+        const widget = location === ChatAgentLocation.EditingSession
+            ? await showEditsView(this.viewsService)
+            : (this.chatWidgetService.lastFocusedWidget ?? (await showChatView(this.viewsService)));
         if (!widget || !widget.viewModel) {
             return;
         }

package/vscode/src/vs/workbench/contrib/chat/browser/chatViewPane.d.ts

@@ -0,0 +1,54 @@
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
+import { IHoverService } from "vscode/vscode/vs/platform/hover/browser/hover.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { ILayoutService } from "vscode/vscode/vs/platform/layout/browser/layoutService.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IOpenerService } from "vscode/vscode/vs/platform/opener/common/opener.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { IViewPaneOptions, ViewPane } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { IChatViewTitleActionContext } from "vscode/vscode/vs/workbench/contrib/chat/common/chatActions";
+import { ChatAgentLocation } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+import { IChatService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { ChatWidget, IChatViewState } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
+import { IViewWelcomeDelegate } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController";
+export declare const CHAT_SIDEBAR_OLD_VIEW_PANEL_ID = "workbench.panel.chatSidebar";
+export declare const CHAT_SIDEBAR_PANEL_ID = "workbench.panel.chat";
+export declare const CHAT_EDITING_SIDEBAR_PANEL_ID = "workbench.panel.chatEditing";
+export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
+    private readonly chatOptions;
+    private readonly storageService;
+    private readonly chatService;
+    private readonly chatAgentService;
+    private readonly logService;
+    private readonly layoutService;
+    private _widget;
+    get widget(): ChatWidget;
+    private readonly modelDisposables;
+    private memento;
+    private readonly viewState;
+    private defaultParticipantRegistrationFailed;
+    private didUnregisterProvider;
+    constructor(chatOptions: {
+        location: ChatAgentLocation.Panel | ChatAgentLocation.EditingSession;
+    }, options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, telemetryService: ITelemetryService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, layoutService: ILayoutService);
+    getActionsContext(): IChatViewTitleActionContext | undefined;
+    private updateModel;
+    shouldShowWelcome(): boolean;
+    private getSessionId;
+    protected renderBody(parent: HTMLElement): void;
+    acceptInput(query?: string): void;
+    private clear;
+    loadSession(sessionId: string, viewState?: IChatViewState): void;
+    focusInput(): void;
+    focus(): void;
+    protected layoutBody(height: number, width: number): void;
+    saveState(): void;
+    private updateViewState;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/chatViewPane.js

@@ -1,6 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { getWindow, $ } from 'vscode/vscode/vs/base/browser/dom';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
@@ -8,8 +11,10 @@ import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.ser
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
@@ -24,29 +29,31 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
+import { ViewPane } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { Memento } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/common/memento';
 import { SIDE_BAR_FOREGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatModelInitState } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { ChatModelInitState } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatWidget } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatViewWelcomeController } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
+import { SetupWelcomeViewKeys, SetupWelcomeViewCondition } from './chatSetup.js';
+import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { ChatViewWelcomeController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
 
 const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chat';
 const CHAT_EDITING_SIDEBAR_PANEL_ID = 'workbench.panel.chatEditing';
 let ChatViewPane = class ChatViewPane extends ViewPane {
     get widget() { return this._widget; }
-    constructor(chatOptions, options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, storageService, chatService, chatAgentService, logService) {
+    constructor(chatOptions, options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, storageService, chatService, chatAgentService, logService, layoutService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.chatOptions = chatOptions;
         this.storageService = storageService;
         this.chatService = chatService;
         this.chatAgentService = chatAgentService;
         this.logService = logService;
+        this.layoutService = layoutService;
         this.modelDisposables = this._register(( new DisposableStore()));
         this.defaultParticipantRegistrationFailed = false;
         this.didUnregisterProvider = false;
@@ -54,7 +61,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             'interactive-session-view-' + CHAT_PROVIDER_ID + (this.chatOptions.location === ChatAgentLocation.EditingSession ? `-edits` : ''),
             this.storageService
         ));
-        this.viewState = this.memento.getMemento(1 , 1 );
+        this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         this._register(this.chatAgentService.onDidChangeAgents(() => {
             if (this.chatAgentService.getDefaultAgent(this.chatOptions?.location)) {
                 if (!this._widget?.viewModel) {
@@ -78,11 +85,16 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             }
             this._onDidChangeViewWelcomeState.fire();
         }));
+        this._register(this.contextKeyService.onDidChangeContext(e => {
+            if (e.affectsSome(SetupWelcomeViewKeys)) {
+                this._onDidChangeViewWelcomeState.fire();
+            }
+        }));
     }
     getActionsContext() {
         return this.widget?.viewModel ? {
             sessionId: this.widget.viewModel.sessionId,
-            $mid: 19
+            $mid: MarshalledId.ChatViewContext
         } : undefined;
     }
     updateModel(model, viewState) {
@@ -101,10 +113,11 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.updateActions();
     }
     shouldShowWelcome() {
+        const showSetup = this.contextKeyService.contextMatchesRules(SetupWelcomeViewCondition);
         const noPersistedSessions = !this.chatService.hasSessions();
-        const shouldShow = this.didUnregisterProvider || !this._widget?.viewModel && noPersistedSessions || this.defaultParticipantRegistrationFailed;
-        this.logService.trace(`ChatViewPane#shouldShowWelcome(${this.chatOptions.location}) = ${shouldShow}: didUnregister=${this.didUnregisterProvider} || noViewModel:${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions} || defaultParticipantRegistrationFailed=${this.defaultParticipantRegistrationFailed}`);
-        return shouldShow;
+        const shouldShow = this.didUnregisterProvider || !this._widget?.viewModel && noPersistedSessions || this.defaultParticipantRegistrationFailed || showSetup;
+        this.logService.trace(`ChatViewPane#shouldShowWelcome(${this.chatOptions.location}) = ${shouldShow}: didUnregister=${this.didUnregisterProvider} || noViewModel:${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions} || defaultParticipantRegistrationFailed=${this.defaultParticipantRegistrationFailed} || showSetup=${showSetup}`);
+        return !!shouldShow;
     }
     getSessionId() {
         let sessionId;
@@ -123,6 +136,8 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             this._register(this.instantiationService.createInstance(ChatViewWelcomeController, parent, this, this.chatOptions.location));
             const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
             const locationBasedColors = this.getLocationBasedColors();
+            const editorOverflowNode = this.layoutService.getContainer(getWindow(parent)).appendChild($('.chat-editor-overflow.monaco-editor'));
+            this._register({ dispose: () => editorOverflowNode.remove() });
             this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, this.chatOptions.location, { viewId: this.id }, {
                 autoScroll: this.chatOptions.location === ChatAgentLocation.EditingSession,
                 renderFollowups: this.chatOptions.location === ChatAgentLocation.Panel,
@@ -134,7 +149,8 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                         return this.chatOptions.location === ChatAgentLocation.EditingSession;
                     },
                 },
-                enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel
+                enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel,
+                editorOverflowWidgetsDomNode: editorOverflowNode,
             }, {
                 listForeground: SIDE_BAR_FOREGROUND,
                 listBackground: locationBasedColors.background,
@@ -221,7 +237,8 @@ ChatViewPane = ( __decorate([
     ( __param(12, IStorageService)),
     ( __param(13, IChatService)),
     ( __param(14, IChatAgentService)),
-    ( __param(15, ILogService))
+    ( __param(15, ILogService)),
+    ( __param(16, ILayoutService))
 ], ChatViewPane));
 
 export { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID, ChatViewPane };

package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.d.ts

@@ -0,0 +1,9 @@
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatCodeBlockContextProviderService } from "vscode/vscode/vs/workbench/contrib/chat/browser/chat.service";
+export declare class ChatCodeBlockContextProviderService implements IChatCodeBlockContextProviderService {
+    _serviceBrand: undefined;
+    private readonly _providers;
+    get providers(): ICodeBlockActionContextProvider[];
+    registerProvider(provider: ICodeBlockActionContextProvider, id: string): IDisposable;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.js

@@ -1,3 +1,4 @@
+
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 
 class ChatCodeBlockContextProviderService {

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
@@ -16,12 +17,12 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { ChatWidget } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatSlashCommandForeground, chatSlashCommandBackground } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { chatSlashCommandForeground, chatSlashCommandBackground } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/chatColors';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/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';
 
 const decorationDescription = 'chat';
 const placeholderDecorationType = 'chat-session-detail';
@@ -277,6 +278,7 @@ let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
                                 range: rangeToDelete,
                                 text: '',
                             }]);
+                        this.widget.refreshParsedInput();
                     }
                 });
             }

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.d.ts

@@ -0,0 +1,26 @@
+import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+import { Range } from "vscode/vscode/vs/editor/common/core/range";
+import { IModelDecoration } from "vscode/vscode/vs/editor/common/model";
+import { HoverAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverParts } from "vscode/vscode/vs/editor/contrib/hover/browser/hoverTypes";
+import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IChatWidgetService } from "vscode/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IChatAgentData } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents";
+export declare class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAgentHoverPart> {
+    private readonly editor;
+    private readonly instantiationService;
+    private readonly chatWidgetService;
+    private readonly commandService;
+    readonly hoverOrdinal: number;
+    constructor(editor: ICodeEditor, instantiationService: IInstantiationService, chatWidgetService: IChatWidgetService, commandService: ICommandService);
+    computeSync(anchor: HoverAnchor, _lineDecorations: IModelDecoration[]): ChatAgentHoverPart[];
+    renderHoverParts(context: IEditorHoverRenderContext, hoverParts: ChatAgentHoverPart[]): IRenderedHoverParts<ChatAgentHoverPart>;
+    getAccessibleContent(hoverPart: ChatAgentHoverPart): string;
+}
+export declare class ChatAgentHoverPart implements IHoverPart {
+    readonly owner: IEditorHoverParticipant<ChatAgentHoverPart>;
+    readonly range: Range;
+    readonly agent: IChatAgentData;
+    constructor(owner: IEditorHoverParticipant<ChatAgentHoverPart>, range: Range, agent: IChatAgentData);
+    isValidForHoverAnchor(anchor: HoverAnchor): boolean;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.js

@@ -1,13 +1,14 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { RenderedHoverParts, HoverParticipantRegistry } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverTypes';
+import { RenderedHoverParts, HoverAnchorType, HoverParticipantRegistry } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverTypes';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
+import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
-import { extractAgentAndCommand } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { extractAgentAndCommand } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { localize } from 'vscode/vscode/vs/nls';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
@@ -31,17 +32,15 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
             return [];
         }
         if (Range.containsPosition(agentPart.editorRange, anchor.range.getStartPosition())) {
-            return [( (new ChatAgentHoverPart(this, Range.lift(agentPart.editorRange), agentPart.agent)))];
+            return [( new ChatAgentHoverPart(this, Range.lift(agentPart.editorRange), agentPart.agent))];
         }
         return [];
     }
     renderHoverParts(context, hoverParts) {
         if (!hoverParts.length) {
-            return (
-                 (new RenderedHoverParts([]))
-            );
+            return ( new RenderedHoverParts([]));
         }
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         const hover = disposables.add(this.instantiationService.createInstance(ChatAgentHover));
         disposables.add(hover.onDidChangeContents(() => context.onContentsChanged()));
         const hoverPart = hoverParts[0];
@@ -56,19 +55,17 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
             hoverElement: wrapperNode,
             dispose() { disposables.dispose(); }
         };
-        return (
-             (new RenderedHoverParts([renderedHoverPart]))
-        );
+        return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return ( localize(7674, 'There is a chat agent hover part here.'));
+        return localize(4572, 'There is a chat agent hover part here.');
     }
 };
-ChatAgentHoverParticipant = ( (__decorate([
-    ( (__param(1, IInstantiationService))),
-    ( (__param(2, IChatWidgetService))),
-    ( (__param(3, ICommandService)))
-], ChatAgentHoverParticipant)));
+ChatAgentHoverParticipant = ( __decorate([
+    ( __param(1, IInstantiationService)),
+    ( __param(2, IChatWidgetService)),
+    ( __param(3, ICommandService))
+], ChatAgentHoverParticipant));
 class ChatAgentHoverPart {
     constructor(owner, range, agent) {
         this.owner = owner;
@@ -76,7 +73,7 @@ class ChatAgentHoverPart {
         this.agent = agent;
     }
     isValidForHoverAnchor(anchor) {
-        return (anchor.type === 1
+        return (anchor.type === HoverAnchorType.Range
             && this.range.startColumn <= anchor.range.startColumn
             && this.range.endColumn >= anchor.range.endColumn);
     }

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.d.ts

@@ -0,0 +1,15 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IChatEditingService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
+import { IChatWidgetService } from "vscode/vscode/vs/workbench/contrib/chat/browser/chat.service";
+export declare class ChatRelatedFilesContribution extends Disposable implements IWorkbenchContribution {
+    private readonly chatEditingService;
+    private readonly chatWidgetService;
+    static readonly ID = "chat.relatedFilesWorkingSet";
+    private readonly chatEditingSessionDisposables;
+    private _currentRelatedFilesRetrievalOperation;
+    constructor(chatEditingService: IChatEditingService, chatWidgetService: IChatWidgetService);
+    private _updateRelatedFileSuggestions;
+    private _handleNewEditingSession;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.js

@@ -0,0 +1,108 @@
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { localize } from 'vscode/vscode/vs/nls';
+import { WorkingSetEntryState, WorkingSetEntryRemovalReason, ChatEditingSessionChangeType } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { IChatEditingService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+
+let ChatRelatedFilesContribution = class ChatRelatedFilesContribution extends Disposable {
+    static { this.ID = 'chat.relatedFilesWorkingSet'; }
+    constructor(chatEditingService, chatWidgetService) {
+        super();
+        this.chatEditingService = chatEditingService;
+        this.chatWidgetService = chatWidgetService;
+        this.chatEditingSessionDisposables = ( new DisposableStore());
+        this._handleNewEditingSession();
+        this._register(this.chatEditingService.onDidCreateEditingSession(() => {
+            this.chatEditingSessionDisposables.clear();
+            this._handleNewEditingSession();
+        }));
+    }
+    _updateRelatedFileSuggestions() {
+        if (this._currentRelatedFilesRetrievalOperation) {
+            return;
+        }
+        const currentEditingSession = this.chatEditingService.currentEditingSessionObs.get();
+        if (!currentEditingSession) {
+            return;
+        }
+        const workingSetEntries = currentEditingSession.entries.get();
+        if (workingSetEntries.length > 0) {
+            return;
+        }
+        const widget = this.chatWidgetService.getWidgetBySessionId(currentEditingSession.chatSessionId);
+        if (!widget) {
+            return;
+        }
+        this._currentRelatedFilesRetrievalOperation = this.chatEditingService.getRelatedFiles(currentEditingSession.chatSessionId, widget.getInput(), CancellationToken.None)
+            .then((files) => {
+            if (!files?.length) {
+                return;
+            }
+            const currentEditingSession = this.chatEditingService.currentEditingSessionObs.get();
+            if (!currentEditingSession || currentEditingSession.chatSessionId !== widget.viewModel?.sessionId || currentEditingSession.entries.get().length) {
+                return;
+            }
+            const maximumRelatedFiles = Math.min(2, this.chatEditingService.editingSessionFileLimit - widget.input.chatEditWorkingSetFiles.length);
+            const newSuggestions = ( new ResourceMap());
+            for (const group of files) {
+                for (const file of group.files) {
+                    if (newSuggestions.size >= maximumRelatedFiles) {
+                        break;
+                    }
+                    newSuggestions.set(file.uri, { group: group.group, description: file.description });
+                }
+            }
+            const existingSuggestedEntriesToRemove = [];
+            for (const entry of currentEditingSession.workingSet) {
+                if (entry[1].state === WorkingSetEntryState.Suggested && !( newSuggestions.has(entry[0]))) {
+                    existingSuggestedEntriesToRemove.push(entry[0]);
+                }
+            }
+            currentEditingSession?.remove(WorkingSetEntryRemovalReason.Programmatic, ...existingSuggestedEntriesToRemove);
+            for (const [uri, data] of newSuggestions) {
+                currentEditingSession.addFileToWorkingSet(uri, ( localize(4573, "{0} (Suggested)", data.description)), WorkingSetEntryState.Suggested);
+            }
+        })
+            .finally(() => {
+            this._currentRelatedFilesRetrievalOperation = undefined;
+        });
+    }
+    _handleNewEditingSession() {
+        const currentEditingSession = this.chatEditingService.currentEditingSessionObs.get();
+        if (!currentEditingSession) {
+            return;
+        }
+        const widget = this.chatWidgetService.getWidgetBySessionId(currentEditingSession.chatSessionId);
+        if (!widget || widget.viewModel?.sessionId !== currentEditingSession.chatSessionId) {
+            return;
+        }
+        this.chatEditingSessionDisposables.add(currentEditingSession.onDidDispose(() => {
+            this.chatEditingSessionDisposables.clear();
+        }));
+        this._updateRelatedFileSuggestions();
+        const onDebouncedType = Event.debounce(widget.inputEditor.onDidChangeModelContent, () => null, 3000);
+        this.chatEditingSessionDisposables.add(onDebouncedType(() => {
+            this._updateRelatedFileSuggestions();
+        }));
+        this.chatEditingSessionDisposables.add(currentEditingSession.onDidChange((e) => {
+            if (e === ChatEditingSessionChangeType.WorkingSet) {
+                this._updateRelatedFileSuggestions();
+            }
+        }));
+    }
+    dispose() {
+        this.chatEditingSessionDisposables.dispose();
+        super.dispose();
+    }
+};
+ChatRelatedFilesContribution = ( __decorate([
+    ( __param(0, IChatEditingService)),
+    ( __param(1, IChatWidgetService))
+], ChatRelatedFilesContribution));
+
+export { ChatRelatedFilesContribution };

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.d.ts

@@ -0,0 +1,7 @@
+import { IHoverAction } from "vscode/vscode/vs/base/browser/ui/hover/hover";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+export declare class ChatEditorHoverWrapper {
+    private readonly keybindingService;
+    readonly domNode: HTMLElement;
+    constructor(hoverContentElement: HTMLElement, actions: IHoverAction[] | undefined, keybindingService: IKeybindingService);
+}

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.js

@@ -1,13 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import './media/editorHoverWrapper.css.js';
 import { $ as $$1, h as h$1 } from 'vscode/vscode/vs/base/browser/dom';
-import 'vscode/vscode/vs/base/browser/browser';
-import 'vscode/vscode/vs/base/common/keyCodes';
-import 'vscode/vscode/vs/base/common/platform';
-import 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
-import 'vscode/vscode/vs/base/common/lifecycle';
-import 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget.css';
-import 'vscode/vscode/vs/nls';
+import 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 
 const $ = $$1;

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/media/editorHoverWrapper.css.js

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".chat-editor-hover-wrapper-content{padding:2px 8px}";
 n(css,{});

package/vscode/src/vs/workbench/contrib/chat/browser/languageModelToolsService.d.ts

@@ -0,0 +1,31 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IDialogService } from "vscode/vscode/vs/platform/dialogs/common/dialogs.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IChatService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult } from "vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { ILanguageModelToolsService } from "vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+export declare class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
+    private readonly _extensionService;
+    private readonly _contextKeyService;
+    private readonly _chatService;
+    private readonly _dialogService;
+    private readonly _telemetryService;
+    _serviceBrand: undefined;
+    private _onDidChangeTools;
+    readonly onDidChangeTools: import("vscode/vscode/vs/base/common/event").Event<void>;
+    private _onDidChangeToolsScheduler;
+    private _tools;
+    private _toolContextKeys;
+    constructor(_extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService);
+    registerToolData(toolData: IToolData): IDisposable;
+    private _refreshAllToolContextKeys;
+    registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
+    getTools(): Iterable<Readonly<IToolData>>;
+    getTool(id: string): IToolData | undefined;
+    private _getToolEntry;
+    getToolByName(name: string): IToolData | undefined;
+    invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
+}