@codingame/monaco-vscode-chat-service-override 13.1.6 → 14.0.0

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

@@ -0,0 +1,22 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { EditTool, EditToolData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/editFileTool';
+
+let BuiltinToolsContribution = class BuiltinToolsContribution extends Disposable {
+    static { this.ID = 'chat.builtinTools'; }
+    constructor(toolsService, instantiationService) {
+        super();
+        const editTool = instantiationService.createInstance(EditTool);
+        this._register(toolsService.registerToolData(EditToolData));
+        this._register(toolsService.registerToolImplementation(EditToolData.id, editTool));
+    }
+};
+BuiltinToolsContribution = ( __decorate([
+    ( __param(0, ILanguageModelToolsService)),
+    ( __param(1, IInstantiationService))
+], BuiltinToolsContribution));
+
+export { BuiltinToolsContribution };

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

@@ -4,7 +4,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatModel } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { ISpeechToTextEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService";
 import { ISpeechService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService.service";
 import { IVoiceChatService } from "./voiceChatService.service.js";

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

@@ -7,7 +7,7 @@ import { rtrim } from '@codingame/monaco-vscode-api/vscode/vs/base/common/string
 import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { SpeechToTextStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService';
 import { ISpeechService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService.service';
 
@@ -21,7 +21,7 @@ var PhraseTextType;
 const VoiceChatInProgress = ( new RawContextKey(
     'voiceChatInProgress',
     false,
-    { type: 'boolean', description: ( localize(4659, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(4790, "A speech-to-text session is in progress for chat.")) }
 ));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static { VoiceChatService_1 = this; }

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js

@@ -2,14 +2,13 @@
 import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from '@codingame/monaco-vscode-9e30237f-37af-5bbd-8bc1-5c4f2c0714b3-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
 import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import './inlineChatSavingServiceImpl.js';
 import { InlineChatAccessibleView } from './inlineChatAccessibleView.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { InlineChatEnabler } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
@@ -20,7 +19,11 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { InlineChatAccessibilityHelp } from './inlineChatAccessibilityHelp.js';
 import { InlineChatExpandLineAction, ShowInlineChatHintAction, HideInlineChatHintAction, InlineChatHintsController } from './inlineChatCurrentLine.js';
+import { InlineChatController2, StartSessionAction2, StopSessionAction2 } from './inlineChatController2.js';
 
+registerEditorContribution(InlineChatController2.ID, InlineChatController2, EditorContributionInstantiation.Eager);
+registerAction2(StartSessionAction2);
+registerAction2(StopSessionAction2);
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController, EditorContributionInstantiation.Eager);
 registerAction2(InlineChatExpandLineAction);
 registerAction2(ShowInlineChatHintAction);
@@ -31,7 +34,7 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(6758, "Edit Code")),
+        title: ( localize(6904, "Edit Code")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING)),
 };
@@ -40,7 +43,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(6759, "Generate")),
+        title: ( localize(6905, "Generate")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()))),
 };
@@ -51,8 +54,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(6760, "Cancel Request")),
-        shortTitle: ( localize(6761, "Cancel")),
+        title: ( localize(6906, "Cancel Request")),
+        shortTitle: ( localize(6907, "Cancel")),
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.d.ts

@@ -1,7 +1,7 @@
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 import { AccessibleViewType } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView";
-import { IAccessibleViewImplentation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
-export declare class InlineChatAccessibilityHelp implements IAccessibleViewImplentation {
+import { IAccessibleViewImplementation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
+export declare class InlineChatAccessibilityHelp implements IAccessibleViewImplementation {
     readonly priority = 106;
     readonly name = "inlineChat";
     readonly type = AccessibleViewType.Help;

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.d.ts

@@ -1,7 +1,7 @@
 import { AccessibleViewType, AccessibleContentProvider } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IAccessibleViewImplentation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
-export declare class InlineChatAccessibleView implements IAccessibleViewImplentation {
+import { IAccessibleViewImplementation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
+export declare class InlineChatAccessibleView implements IAccessibleViewImplementation {
     readonly priority = 100;
     readonly name = "inlineChat";
     readonly when: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController2.d.ts

@@ -0,0 +1,39 @@
+import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
+import { EditorAction2, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
+import { IEditorContribution } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
+import { IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
+import { IInlineChatSessionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service";
+export declare const CTX_HAS_SESSION: RawContextKey<"active" | "empty" | undefined>;
+export declare class InlineChatController2 implements IEditorContribution {
+    private readonly _editor;
+    private readonly _instaService;
+    private readonly _notebookEditorService;
+    static readonly ID = "editor.contrib.inlineChatController2";
+    static get(editor: ICodeEditor): InlineChatController2 | undefined;
+    private readonly _store;
+    private readonly _showWidgetOverrideObs;
+    private readonly _isActiveController;
+    constructor(_editor: ICodeEditor, _instaService: IInstantiationService, _notebookEditorService: INotebookEditorService, inlineChatSessions: IInlineChatSessionService, contextKeyService: IContextKeyService);
+    dispose(): void;
+    toggleWidgetUntilNextRequest(): void;
+    markActiveController(): void;
+}
+export declare class StartSessionAction2 extends EditorAction2 {
+    constructor();
+    runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ...args: any[]): Promise<void>;
+}
+declare abstract class AbstractInlineChatAction extends EditorAction2 {
+    static readonly category: import("@codingame/monaco-vscode-api/vscode/vs/nls").ILocalizedString;
+    constructor(desc: IAction2Options);
+    runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ..._args: any[]): void;
+    abstract runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController2, editor: ICodeEditor, ...args: any[]): void;
+}
+export declare class StopSessionAction2 extends AbstractInlineChatAction {
+    constructor();
+    runInlineChatCommand(accessor: ServicesAccessor, _ctrl: InlineChatController2, editor: ICodeEditor, ...args: any[]): void;
+}
+export {};

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController2.js

@@ -0,0 +1,314 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { observableValue, transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import { observableSignalFromEvent, observableFromEvent, constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { isCodeEditor, isDiffEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
+import { EditorAction2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
+import { observableCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/observableCodeEditor';
+import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService';
+import { EmbeddedCodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
+import { EmbeddedDiffEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget';
+import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ctxIsGlobalEditingSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorController';
+import { ChatEditorOverlayController } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorOverlay';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { WorkingSetEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
+import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_POSSIBLE } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
+import { InlineChatZoneWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget';
+
+var InlineChatController2_1;
+const CTX_HAS_SESSION = ( new RawContextKey('inlineChatHasSession', undefined, ( localize(6931, "The current editor has an active inline chat session"))));
+let InlineChatController2 = class InlineChatController2 {
+    static { InlineChatController2_1 = this; }
+    static { this.ID = 'editor.contrib.inlineChatController2'; }
+    static get(editor) {
+        return editor.getContribution(InlineChatController2_1.ID) ?? undefined;
+    }
+    constructor(_editor, _instaService, _notebookEditorService, inlineChatSessions, contextKeyService) {
+        this._editor = _editor;
+        this._instaService = _instaService;
+        this._notebookEditorService = _notebookEditorService;
+        this._store = ( new DisposableStore());
+        this._showWidgetOverrideObs = observableValue(this, false);
+        this._isActiveController = observableValue(this, false);
+        const ctxHasSession = CTX_HAS_SESSION.bindTo(contextKeyService);
+        const ctxInlineChatVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
+        const zone = ( new Lazy(() => {
+            const location = {
+                location: ChatAgentLocation.Editor,
+                resolveData: () => {
+                    assertType(this._editor.hasModel());
+                    return {
+                        type: ChatAgentLocation.Editor,
+                        selection: this._editor.getSelection(),
+                        document: this._editor.getModel().uri,
+                        wholeRange: this._editor.getSelection(),
+                    };
+                }
+            };
+            for (const notebookEditor of this._notebookEditorService.listNotebookEditors()) {
+                for (const [, codeEditor] of notebookEditor.codeEditors) {
+                    if (codeEditor === this._editor) {
+                        location.location = ChatAgentLocation.Notebook;
+                        break;
+                    }
+                }
+            }
+            const result = this._instaService.createInstance(InlineChatZoneWidget, location, {
+                enableWorkingSet: 'implicit',
+                rendererOptions: {
+                    renderCodeBlockPills: true,
+                    renderTextEditsAsSummary: uri => isEqual(uri, _editor.getModel()?.uri)
+                }
+            }, this._editor);
+            result.domNode.classList.add('inline-chat-2');
+            return result;
+        }));
+        const editorObs = observableCodeEditor(_editor);
+        const sessionsSignal = observableSignalFromEvent(this, inlineChatSessions.onDidChangeSessions);
+        const sessionObs = derived(r => {
+            sessionsSignal.read(r);
+            const model = editorObs.model.read(r);
+            const value = model && inlineChatSessions.getSession2(model.uri);
+            return value ?? undefined;
+        });
+        this._store.add(autorunWithStore((r, store) => {
+            const session = sessionObs.read(r);
+            if (!session) {
+                ctxHasSession.set(undefined);
+                this._isActiveController.set(false, undefined);
+            }
+            else {
+                const checkRequests = () => ctxHasSession.set(session.chatModel.getRequests().length === 0 ? 'empty' : 'active');
+                store.add(session.chatModel.onDidChange(checkRequests));
+                checkRequests();
+            }
+        }));
+        const visibleSessionObs = observableValue(this, undefined);
+        this._store.add(autorunWithStore((r, store) => {
+            const session = sessionObs.read(r);
+            const isActive = this._isActiveController.read(r);
+            if (!session || !isActive) {
+                visibleSessionObs.set(undefined, undefined);
+                return;
+            }
+            const { chatModel } = session;
+            const showShowUntil = this._showWidgetOverrideObs.read(r);
+            const hasNoRequests = chatModel.getRequests().length === 0;
+            store.add(chatModel.onDidChange(e => {
+                if (e.kind === 'addRequest') {
+                    transaction(tx => {
+                        this._showWidgetOverrideObs.set(false, tx);
+                        visibleSessionObs.set(undefined, tx);
+                    });
+                }
+            }));
+            if (showShowUntil || hasNoRequests) {
+                visibleSessionObs.set(session, undefined);
+            }
+            else {
+                visibleSessionObs.set(undefined, undefined);
+            }
+        }));
+        this._store.add(autorun(r => {
+            const session = visibleSessionObs.read(r);
+            if (!session) {
+                zone.rawValue?.hide();
+                _editor.focus();
+                ctxInlineChatVisible.reset();
+            }
+            else {
+                ctxInlineChatVisible.set(true);
+                zone.value.widget.setChatModel(session.chatModel);
+                if (!zone.value.position) {
+                    zone.value.show(session.initialPosition);
+                }
+                zone.value.reveal(zone.value.position);
+                zone.value.widget.focus();
+                session.editingSession.getEntry(session.uri)?.autoAcceptController.get()?.cancel();
+            }
+        }));
+        this._store.add(autorun(r => {
+            const overlay = ChatEditorOverlayController.get(_editor);
+            const session = sessionObs.read(r);
+            const model = editorObs.model.read(r);
+            if (!session || !model) {
+                overlay.hide();
+                return;
+            }
+            const lastResponse = observableFromEvent(this, session.chatModel.onDidChange, () => session.chatModel.getRequests().at(-1)?.response);
+            const response = lastResponse.read(r);
+            const isInProgress = response
+                ? observableFromEvent(this, response.onDidChange, () => !response.isComplete)
+                : constObservable(false);
+            if (isInProgress.read(r)) {
+                overlay.showRequest(session.editingSession);
+            }
+            else if (session.editingSession.getEntry(session.uri)?.state.get() !== WorkingSetEntryState.Modified) {
+                overlay.hide();
+            }
+        }));
+    }
+    dispose() {
+        this._store.dispose();
+    }
+    toggleWidgetUntilNextRequest() {
+        const value = this._showWidgetOverrideObs.get();
+        this._showWidgetOverrideObs.set(!value, undefined);
+    }
+    markActiveController() {
+        this._isActiveController.set(true, undefined);
+    }
+};
+InlineChatController2 = InlineChatController2_1 = ( __decorate([
+    ( __param(1, IInstantiationService)),
+    ( __param(2, INotebookEditorService)),
+    ( __param(3, IInlineChatSessionService)),
+    ( __param(4, IContextKeyService))
+], InlineChatController2));
+class StartSessionAction2 extends EditorAction2 {
+    constructor() {
+        super({
+            id: 'inlineChat2.start',
+            title: ( localize2(6932, "Inline Chat")),
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_POSSIBLE, ( CTX_HAS_SESSION.negate()), EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate()))),
+            f1: true,
+            category: AbstractInlineChatAction.category,
+            keybinding: {
+                when: EditorContextKeys.focus,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyI
+            },
+            menu: {
+                id: MenuId.ChatCommandCenter,
+                group: 'd_inlineChat',
+                order: 10,
+                when: CTX_INLINE_CHAT_HAS_AGENT2
+            }
+        });
+    }
+    async runEditorCommand(accessor, editor, ...args) {
+        const inlineChatSessions = accessor.get(IInlineChatSessionService);
+        if (!editor.hasModel()) {
+            return;
+        }
+        const textModel = editor.getModel();
+        await inlineChatSessions.createSession2(editor, textModel.uri, CancellationToken.None);
+        InlineChatController2.get(editor)?.markActiveController();
+    }
+}
+class AbstractInlineChatAction extends EditorAction2 {
+    static { this.category = ( localize2(6933, "Inline Chat")); }
+    constructor(desc) {
+        super({
+            ...desc,
+            category: AbstractInlineChatAction.category,
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_AGENT2, desc.precondition))
+        });
+    }
+    runEditorCommand(accessor, editor, ..._args) {
+        const editorService = accessor.get(IEditorService);
+        const logService = accessor.get(ILogService);
+        let ctrl = InlineChatController2.get(editor);
+        if (!ctrl) {
+            const { activeTextEditorControl } = editorService;
+            if (isCodeEditor(activeTextEditorControl)) {
+                editor = activeTextEditorControl;
+            }
+            else if (isDiffEditor(activeTextEditorControl)) {
+                editor = activeTextEditorControl.getModifiedEditor();
+            }
+            ctrl = InlineChatController2.get(editor);
+        }
+        if (!ctrl) {
+            logService.warn('[IE] NO controller found for action', this.desc.id, editor.getModel()?.uri);
+            return;
+        }
+        if (editor instanceof EmbeddedCodeEditorWidget) {
+            editor = editor.getParentEditor();
+        }
+        if (!ctrl) {
+            for (const diffEditor of accessor.get(ICodeEditorService).listDiffEditors()) {
+                if (diffEditor.getOriginalEditor() === editor || diffEditor.getModifiedEditor() === editor) {
+                    if (diffEditor instanceof EmbeddedDiffEditorWidget) {
+                        this.runEditorCommand(accessor, diffEditor.getParentEditor(), ..._args);
+                    }
+                }
+            }
+            return;
+        }
+        this.runInlineChatCommand(accessor, ctrl, editor, ..._args);
+    }
+}
+class StopSessionAction2 extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: 'inlineChat2.stop',
+            title: ( localize2(6934, "Stop")),
+            f1: true,
+            precondition: ( ContextKeyExpr.and(( CTX_HAS_SESSION.isEqualTo('empty')), CTX_INLINE_CHAT_VISIBLE)),
+            keybinding: {
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyCode.Escape,
+                secondary: [KeyMod.CtrlCmd | KeyCode.KeyI]
+            },
+        });
+    }
+    runInlineChatCommand(accessor, _ctrl, editor, ...args) {
+        const inlineChatSessions = accessor.get(IInlineChatSessionService);
+        if (!editor.hasModel()) {
+            return;
+        }
+        const textModel = editor.getModel();
+        inlineChatSessions.getSession2(textModel.uri)?.dispose();
+    }
+}
+class RevealWidget extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: 'inlineChat2.reveal',
+            title: ( localize2(6935, "Toggle Inline Chat")),
+            f1: true,
+            icon: Codicon.copilot,
+            precondition: ( ContextKeyExpr.and(CTX_HAS_SESSION)),
+            keybinding: {
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyI
+            },
+            menu: {
+                id: MenuId.ChatEditingEditorContent,
+                when: ( ContextKeyExpr.and(CTX_HAS_SESSION, ( ctxIsGlobalEditingSession.negate()))),
+                group: 'navigate',
+                order: 4,
+            }
+        });
+    }
+    runInlineChatCommand(_accessor, ctrl, _editor) {
+        ctrl.toggleWidgetUntilNextRequest();
+        ctrl.markActiveController();
+    }
+}
+registerAction2(RevealWidget);
+
+export { CTX_HAS_SESSION, InlineChatController2, StartSessionAction2, StopSessionAction2 };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.js

@@ -11,7 +11,7 @@ import { EditorAction2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/bro
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
-import { AbstractInlineChatAction } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { AbstractInlineChatAction } from '@codingame/monaco-vscode-9e30237f-37af-5bbd-8bc1-5c4f2c0714b3-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -19,7 +19,7 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { StandardTokenType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/encodedTokenAttributes';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
@@ -40,16 +40,17 @@ import { observableCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/edi
 import { PLAINTEXT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/modesRegistry';
 import { createStyleSheet2 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
 import { stringValue } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
+import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 
 var InlineChatHintsController_1;
-const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(6785, "Whether inline chat shows a contextual hint"))));
+const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(6936, "Whether inline chat shows a contextual hint"))));
 const _inlineChatActionId = 'inlineChat.startWithCurrentLine';
 class InlineChatExpandLineAction extends EditorAction2 {
     constructor() {
         super({
             id: _inlineChatActionId,
             category: AbstractInlineChatAction.category,
-            title: ( localize2(6786, "Start in Editor with Current Line")),
+            title: ( localize2(6937, "Start in Editor with Current Line")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
             keybinding: [{
@@ -99,7 +100,7 @@ class ShowInlineChatHintAction extends EditorAction2 {
         super({
             id: 'inlineChat.showHint',
             category: AbstractInlineChatAction.category,
-            title: ( localize2(6787, "Show Inline Chat Hint")),
+            title: ( localize2(6938, "Show Inline Chat Hint")),
             f1: false,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
         });
@@ -124,14 +125,28 @@ class ShowInlineChatHintAction extends EditorAction2 {
         }
         model.tokenization.forceTokenization(position.lineNumber);
         const tokens = model.tokenization.getLineTokens(position.lineNumber);
-        const tokenIndex = tokens.findTokenIndexAtOffset(position.column - 1);
-        const tokenType = tokens.getStandardTokenType(tokenIndex);
-        if (tokenType === StandardTokenType.Comment) {
+        let totalLength = 0;
+        let specialLength = 0;
+        let lastTokenType;
+        tokens.forEach(idx => {
+            const tokenType = tokens.getStandardTokenType(idx);
+            const startOffset = tokens.getStartOffset(idx);
+            const endOffset = tokens.getEndOffset(idx);
+            totalLength += endOffset - startOffset;
+            if (tokenType !== StandardTokenType.Other) {
+                specialLength += endOffset - startOffset;
+            }
+            lastTokenType = tokenType;
+        });
+        if (specialLength / totalLength > 0.25) {
             ctrl.hide();
+            return;
         }
-        else {
-            ctrl.show();
+        if (lastTokenType === StandardTokenType.Comment) {
+            ctrl.hide();
+            return;
         }
+        ctrl.show();
     }
 }
 let InlineChatHintsController = class InlineChatHintsController extends Disposable {
@@ -175,14 +190,14 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
         const decos = this._editor.createDecorationsCollection();
         const editorObs = observableCodeEditor(editor);
         const keyObs = observableFromEvent(keybindingService.onDidUpdateKeybindings, _ => keybindingService.lookupKeybinding(ACTION_START)?.getLabel());
-        const configSignal = observableFromEvent(Event.filter(_configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(InlineChatConfigKeys.LineEmptyHint) || e.affectsConfiguration(InlineChatConfigKeys.LineNLHint)), () => undefined);
+        const configHintEmpty = observableConfigValue(InlineChatConfigKeys.LineEmptyHint, false, this._configurationService);
+        const configHintNL = observableConfigValue(InlineChatConfigKeys.LineNLHint, false, this._configurationService);
         const showDataObs = derived(r => {
             const ghostState = ghostCtrl?.model.read(r)?.state.read(r);
             const textFocus = editorObs.isTextFocused.read(r);
             const position = editorObs.cursorPosition.read(r);
             const model = editorObs.model.read(r);
             const kb = keyObs.read(r);
-            configSignal.read(r);
             if (ghostState !== undefined || !kb || !position || !model || !textFocus) {
                 return undefined;
             }
@@ -193,11 +208,11 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             const isEol = model.getLineMaxColumn(position.lineNumber) === position.column;
             const isWhitespace = model.getLineLastNonWhitespaceColumn(position.lineNumber) === 0 && model.getValueLength() > 0 && position.column > 1;
             if (isWhitespace) {
-                return _configurationService.getValue(InlineChatConfigKeys.LineEmptyHint)
+                return configHintEmpty.read(r)
                     ? { isEol, isWhitespace, kb, position, model }
                     : undefined;
             }
-            if (visible && isEol && _configurationService.getValue(InlineChatConfigKeys.LineNLHint)) {
+            if (visible && isEol && configHintNL.read(r)) {
                 return { isEol, isWhitespace, kb, position, model };
             }
             return undefined;
@@ -212,15 +227,15 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
                 this._ctxShowingHint.reset();
                 return;
             }
-            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(6788, "Chat"));
+            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(6939, "Chat"));
             const { position, isEol, isWhitespace, kb, model } = showData;
             const inlineClassName = ['a' , 'inline-chat-hint', 'inline-chat-hint-text'];
             let content;
             if (isWhitespace) {
-                content = '\u00a0' + ( localize(6789, "{0} to edit with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(6940, "{0} to edit with {1}", kb, agentName));
             }
             else if (isEol) {
-                content = '\u00a0' + ( localize(6790, "{0} to continue with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(6941, "{0} to continue with {1}", kb, agentName));
             }
             else {
                 content = '\u200a' + kb + '\u200a';
@@ -249,7 +264,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             getActions: () => [
                 toAction({
                     id: 'inlineChat.disableHint',
-                    label: ( localize(6791, "Disable Inline Chat Hint")),
+                    label: ( localize(6942, "Disable Inline Chat Hint")),
                     run: async () => {
                         await this._configurationService.updateValue(setting, false);
                     }
@@ -277,7 +292,7 @@ class HideInlineChatHintAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.hideHint',
-            title: ( localize2(6792, "Hide Inline Chat Hint")),
+            title: ( localize2(6943, "Hide Inline Chat Hint")),
             precondition: CTX_INLINE_CHAT_SHOWING_HINT,
             keybinding: {
                 weight: KeybindingWeight.EditorContrib - 10,

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

@@ -1,3 +0,0 @@
-export declare const ACTION_ID_NEW_CHAT = "workbench.action.chat.newChat";
-export declare const ACTION_ID_NEW_EDIT_SESSION = "workbench.action.chat.newEditSession";
-export declare function registerNewChatActions(): void;