@codingame/monaco-vscode-chat-service-override 2.0.3 → 2.1.0

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

@@ -21,7 +21,7 @@ import { CONTEXT_PROVIDER_EXISTS } from 'vscode/vscode/vs/workbench/contrib/chat
 import { ChatModel, ChatWelcomeMessageModel, ChatModelInitState } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
-import { InteractiveSessionVoteDirection, InteractiveSessionCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+import { InteractiveSessionVoteDirection, ChatAgentCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands';
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
@@ -105,7 +105,7 @@ let ChatService = class ChatService extends Disposable {
         else if (action.action.kind === 'copy') {
             this.telemetryService.publicLog2('interactiveSessionCopy', {
                 providerId: action.providerId,
-                copyKind: action.action.copyType === InteractiveSessionCopyKind.Action ? 'action' : 'toolbar'
+                copyKind: action.action.copyKind === ChatAgentCopyKind.Action ? 'action' : 'toolbar'
             });
         }
         else if (action.action.kind === 'insert') {
@@ -197,6 +197,11 @@ let ChatService = class ChatService extends Disposable {
     }
     removeHistoryEntry(sessionId) {
         delete this._persistedSessions[sessionId];
+        this.saveState();
+    }
+    clearAllHistoryEntries() {
+        this._persistedSessions = {};
+        this.saveState();
     }
     startSession(providerId, token) {
         this.trace('startSession', `providerId=${providerId}`);
@@ -342,22 +347,26 @@ let ChatService = class ChatService extends Disposable {
                         if (!request.response) {
                             continue;
                         }
-                        history.push({ role: 1 , content: request.message.text });
-                        history.push({ role: 2 , content: request.response.response.asString() });
+                        const historyRequest = {
+                            sessionId,
+                            requestId: request.id,
+                            agentId: request.response.agent?.id ?? '',
+                            message: request.variableData.message,
+                            variables: request.variableData.variables,
+                            command: request.response.slashCommand?.name
+                        };
+                        history.push({ request: historyRequest, response: request.response.response.value, result: { errorDetails: request.response.errorDetails } });
                     }
-                    request = model.addRequest(parsedRequest, agent);
+                    const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, model, token);
+                    request = model.addRequest(parsedRequest, variableData, agent, agentSlashCommandPart?.command);
                     const requestProps = {
                         sessionId,
                         requestId: request.id,
-                        message,
-                        variables: {},
+                        agentId: agent.id,
+                        message: variableData.message,
+                        variables: variableData.variables,
                         command: agentSlashCommandPart?.command.name ?? '',
                     };
-                    if ('parts' in parsedRequest) {
-                        const varResult = await this.chatVariablesService.resolveVariables(parsedRequest, model, token);
-                        requestProps.variables = varResult.variables;
-                        requestProps.message = varResult.prompt;
-                    }
                     const agentResult = await this.chatAgentService.invokeAgent(agent.id, requestProps, progressCallback, history, token);
                     rawResponse = {
                         session: model.session,
@@ -368,7 +377,7 @@ let ChatService = class ChatService extends Disposable {
                         this.chatAgentService.getFollowups(agent.id, sessionId, CancellationToken.None);
                 }
                 else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
-                    request = model.addRequest(parsedRequest);
+                    request = model.addRequest(parsedRequest, { message, variables: {} });
                     const history = [];
                     for (const request of model.getRequests()) {
                         if (!request.response) {
@@ -455,7 +464,7 @@ let ChatService = class ChatService extends Disposable {
     getProviders() {
         return Array.from(( this._providers.keys()));
     }
-    async addCompleteRequest(sessionId, message, response) {
+    async addCompleteRequest(sessionId, message, variableData, response) {
         this.trace('addCompleteRequest', `message: ${message}`);
         const model = this._sessionModels.get(sessionId);
         if (!model) {
@@ -465,7 +474,7 @@ let ChatService = class ChatService extends Disposable {
         const parsedRequest = typeof message === 'string' ?
             await this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionId, message) :
             message;
-        const request = model.addRequest(parsedRequest);
+        const request = model.addRequest(parsedRequest, variableData || { message: parsedRequest.text, variables: {} });
         if (typeof response.message === 'string') {
             model.acceptResponseProgress(request, { content: response.message, kind: 'content' });
         }

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

@@ -1,22 +1,22 @@
-import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { InlineAccessibilityHelpContribution, StartSessionAction, UnstashSessionAction, MakeRequestAction, StopRequestAction, ReRunRequestAction, DiscardAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, CancelSessionAction, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, PreviousFromHistory, NextFromHistory, ViewInChatAction, ExpandMessageAction, ContractMessageAction, ToggleInlineDiff, ToggleDiffForChange, FeebackHelpfulCommand, FeebackUnhelpfulCommand, ReportIssueForBugCommand, ApplyPreviewEdits, CopyRecordings } from './inlineChatActions.js';
-import { INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, INLINE_CHAT_DECORATIONS_ID } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineAccessibilityHelpContribution, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, MakeRequestAction, StopRequestAction, ReRunRequestAction, DiscardHunkAction, DiscardAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, CancelSessionAction, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, PreviousFromHistory, NextFromHistory, ViewInChatAction, ExpandMessageAction, ContractMessageAction, ToggleDiffForChange, FeebackHelpfulCommand, FeebackUnhelpfulCommand, ReportIssueForBugCommand, AcceptChanges, CopyRecordings } from './inlineChatActions.js';
+import { INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { InlineChatAccessibleViewContribution } from './inlineChatAccessibleView.js';
-import { InlineChatDecorationsContribution } from './inlineChatDecorations.js';
 
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController, 0 );
 registerEditorContribution(INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, InlineAccessibilityHelpContribution, 3 );
-registerEditorContribution(INLINE_CHAT_DECORATIONS_ID, InlineChatDecorationsContribution, 1 );
-registerAction2(StartSessionAction);
+registerAction2(CloseAction);
+registerAction2(ConfigureInlineChatAction);
 registerAction2(UnstashSessionAction);
 registerAction2(MakeRequestAction);
 registerAction2(StopRequestAction);
 registerAction2(ReRunRequestAction);
+registerAction2(DiscardHunkAction);
 registerAction2(DiscardAction);
 registerAction2(DiscardToClipboardAction);
 registerAction2(DiscardUndoToNewFileAction);
@@ -29,12 +29,11 @@ registerAction2(NextFromHistory);
 registerAction2(ViewInChatAction);
 registerAction2(ExpandMessageAction);
 registerAction2(ContractMessageAction);
-registerAction2(ToggleInlineDiff);
 registerAction2(ToggleDiffForChange);
 registerAction2(FeebackHelpfulCommand);
 registerAction2(FeebackUnhelpfulCommand);
 registerAction2(ReportIssueForBugCommand);
-registerAction2(ApplyPreviewEdits);
+registerAction2(AcceptChanges);
 registerAction2(CopyRecordings);
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
 workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, 3 );

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

@@ -1,75 +1,33 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/embeddedCodeEditorWidget';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import { InlineChatController, InlineChatRunOptions } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_HAS_PROVIDER, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_DISCARD, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_TOOLBAR_ICON_ENABLED, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, MENU_INLINE_CHAT_WIDGET, CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST, ACTION_REGENERATE_RESPONSE, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_INNER_CURSOR_START, CTX_INLINE_CHAT_INNER_CURSOR_END, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_WIDGET_FEEDBACK, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, MENU_INLINE_CHAT_WIDGET_TOGGLE, ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_DOCUMENT_CHANGED, ACTION_VIEW_IN_CHAT, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_PROVIDER, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_DISCARD, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, MENU_INLINE_CHAT_INPUT, CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST, ACTION_REGENERATE_RESPONSE, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_INNER_CURSOR_START, CTX_INLINE_CHAT_INNER_CURSOR_END, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_WIDGET_FEEDBACK, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, MENU_INLINE_CHAT_WIDGET, CTX_INLINE_CHAT_DOCUMENT_CHANGED, ACTION_VIEW_IN_CHAT, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IEditorService, SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { fromNow } from 'vscode/vscode/vs/base/common/date';
-import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession';
+import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
 import { runAccessibilityHelpAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { AccessibilityHelpAction } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewActions';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
+import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
-const LOCALIZED_START_INLINE_CHAT_STRING = ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
-    'run',
-    'Start Inline Chat'
-));
-const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localizeWithPath(
+CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
+registerIcon('start-inline-chat', Codicon.sparkle, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
     'startInlineChat',
     'Icon which spawns the inline chat from the editor toolbar.'
 )));
-class StartSessionAction extends EditorAction2 {
-    constructor() {
-        super({
-            id: 'inlineChat.start',
-            title: { value: LOCALIZED_START_INLINE_CHAT_STRING, original: 'Start Inline Chat' },
-            category: AbstractInlineChatAction.category,
-            f1: true,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_PROVIDER, EditorContextKeys.writable)),
-            keybinding: {
-                when: EditorContextKeys.focus,
-                weight: 200 ,
-                primary: 2048  | 39 ,
-                secondary: [KeyChord(2048  | 41 , 39 )],
-            },
-            icon: START_INLINE_CHAT,
-            menu: [{
-                    id: MenuId.EditorTitle,
-                    when: ( ContextKeyExpr.and(
-                        CTX_INLINE_CHAT_TOOLBAR_ICON_ENABLED,
-                        CTX_INLINE_CHAT_HAS_PROVIDER,
-                        ( CTX_INLINE_CHAT_VISIBLE.toNegated()),
-                        EditorContextKeys.focus
-                    )),
-                    group: 'navigation',
-                    order: -1000000,
-                }],
-        });
-    }
-    runEditorCommand(_accessor, editor, ..._args) {
-        let options;
-        const arg = _args[0];
-        if (arg && InlineChatRunOptions.isInteractiveEditorOptions(arg)) {
-            options = arg;
-        }
-        InlineChatController.get(editor)?.run({ ...options });
-    }
-}
 class UnstashSessionAction extends EditorAction2 {
     constructor() {
         super({
@@ -87,7 +45,7 @@ class UnstashSessionAction extends EditorAction2 {
             }
         });
     }
-    runEditorCommand(_accessor, editor, ..._args) {
+    async runEditorCommand(_accessor, editor, ..._args) {
         const ctrl = InlineChatController.get(editor);
         if (ctrl) {
             const session = ctrl.unstashLastSession();
@@ -148,7 +106,7 @@ class MakeRequestAction extends AbstractInlineChatAction {
                 primary: 3
             },
             menu: {
-                id: MENU_INLINE_CHAT_WIDGET,
+                id: MENU_INLINE_CHAT_INPUT,
                 group: 'main',
                 order: 1,
                 when: ( CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST.isEqualTo(false))
@@ -174,7 +132,7 @@ class ReRunRequestAction extends AbstractInlineChatAction {
                 'Regenerate'
             )),
             icon: Codicon.refresh,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_EMPTY.negate()), CTX_INLINE_CHAT_LAST_RESPONSE_TYPE)),
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_EMPTY.negate()), ( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" )))),
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
                 group: '2_feedback',
@@ -198,7 +156,7 @@ class StopRequestAction extends AbstractInlineChatAction {
             icon: Codicon.debugStop,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_EMPTY.negate()), CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST)),
             menu: {
-                id: MENU_INLINE_CHAT_WIDGET,
+                id: MENU_INLINE_CHAT_INPUT,
                 group: 'main',
                 order: 1,
                 when: CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST
@@ -325,6 +283,29 @@ class NextFromHistory extends AbstractInlineChatAction {
         ctrl.populateHistory(false);
     }
 }
+class DiscardHunkAction extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: 'inlineChat.discardHunkChange',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
+                'discard',
+                'Discard'
+            )),
+            icon: Codicon.clearAll,
+            precondition: CTX_INLINE_CHAT_VISIBLE,
+            menu: {
+                id: MENU_INLINE_CHAT_WIDGET_STATUS,
+                when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )), ( CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" )))),
+                group: '0_main',
+                order: 3
+            }
+        });
+    }
+    async runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
+        return ctrl.discardHunk();
+    }
+}
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, {
     submenu: MENU_INLINE_CHAT_WIDGET_DISCARD,
     title: ( localizeWithPath(
@@ -335,7 +316,7 @@ MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, {
     icon: Codicon.discard,
     group: '0_main',
     order: 2,
-    when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo("preview" )), ( CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo("live3" )), ( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )))),
+    when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo("preview" )), ( CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo("live" )), ( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )))),
     rememberDefaultAction: true
 });
 class DiscardAction extends AbstractInlineChatAction {
@@ -420,7 +401,7 @@ class ToggleDiffForChange extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.toggleDiff',
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live3" )), CTX_INLINE_CHAT_CHANGE_HAS_DIFF)),
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" )), CTX_INLINE_CHAT_CHANGE_HAS_DIFF)),
             title: ( localize2WithPath(
                 'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
                 'showChanges',
@@ -434,7 +415,7 @@ class ToggleDiffForChange extends AbstractInlineChatAction {
                 {
                     id: MENU_INLINE_CHAT_WIDGET_FEEDBACK,
                     group: '1_main',
-                    when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live3" )), CTX_INLINE_CHAT_CHANGE_HAS_DIFF))
+                    when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" )), CTX_INLINE_CHAT_CHANGE_HAS_DIFF))
                 }
             ]
         });
@@ -457,7 +438,7 @@ class FeebackHelpfulCommand extends AbstractInlineChatAction {
             toggled: ( CTX_INLINE_CHAT_LAST_FEEDBACK.isEqualTo('helpful')),
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_FEEDBACK,
-                when: ( CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined)),
+                when: ( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" )),
                 group: '2_feedback',
                 order: 1
             }
@@ -481,7 +462,7 @@ class FeebackUnhelpfulCommand extends AbstractInlineChatAction {
             toggled: ( CTX_INLINE_CHAT_LAST_FEEDBACK.isEqualTo('unhelpful')),
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_FEEDBACK,
-                when: ( CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined)),
+                when: ( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" )),
                 group: '2_feedback',
                 order: 2
             }
@@ -501,62 +482,24 @@ class ReportIssueForBugCommand extends AbstractInlineChatAction {
                 'Report Issue'
             )),
             icon: Codicon.report,
-            precondition: CTX_INLINE_CHAT_VISIBLE,
-            menu: {
-                id: MENU_INLINE_CHAT_WIDGET_FEEDBACK,
-                when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, ( CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.notEqualsTo(undefined)))),
-                group: '2_feedback',
-                order: 3
-            }
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" )))),
+            menu: [{
+                    id: MENU_INLINE_CHAT_WIDGET_FEEDBACK,
+                    when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, ( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("empty" )))),
+                    group: '2_feedback',
+                    order: 3
+                }, {
+                    id: MENU_INLINE_CHAT_WIDGET,
+                    group: 'config',
+                    order: 3
+                }]
         });
     }
     runInlineChatCommand(_accessor, ctrl) {
         ctrl.feedbackLast(4 );
     }
 }
-class ToggleInlineDiff extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: 'inlineChat.toggleDiff',
-            title: {
-                original: 'Show Diff',
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
-                    'showDiff',
-                    'Show Diff'
-                )),
-                mnemonicTitle: ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
-                    { key: 'miShowDiff', comment: ['&& denotes a mnemonic'] },
-                    "&&Show Diff"
-                )),
-            },
-            toggled: {
-                condition: ( ContextKeyExpr.equals('config.inlineChat.showDiff', true)),
-                title: ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
-                    'showDiff2',
-                    "Show Diff"
-                )),
-                mnemonicTitle: ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
-                    { key: 'miShowDiff2', comment: ['&& denotes a mnemonic'] },
-                    "&&Show Diff"
-                ))
-            },
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("live" )))),
-            menu: [
-                { id: MENU_INLINE_CHAT_WIDGET_TOGGLE }
-            ]
-        });
-    }
-    runInlineChatCommand(accessor, _ctrl) {
-        const configurationService = accessor.get(IConfigurationService);
-        const newValue = !configurationService.getValue('inlineChat.showDiff');
-        configurationService.updateValue('inlineChat.showDiff', newValue);
-    }
-}
-class ApplyPreviewEdits extends AbstractInlineChatAction {
+class AcceptChanges extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
@@ -582,7 +525,7 @@ class ApplyPreviewEdits extends AbstractInlineChatAction {
                     when: CTX_INLINE_CHAT_USER_DID_EDIT
                 }],
             menu: {
-                when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )), ( CTX_INLINE_CHAT_EDIT_MODE.notEqualsTo("live3" )))),
+                when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_RESPONSE_TYPES.notEqualsTo("onlyMessages" )))),
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
                 group: '0_main',
                 order: 0
@@ -590,7 +533,7 @@ class ApplyPreviewEdits extends AbstractInlineChatAction {
         });
     }
     async runInlineChatCommand(_accessor, ctrl) {
-        ctrl.acceptSession();
+        ctrl.acceptHunk();
     }
 }
 class CancelSessionAction extends AbstractInlineChatAction {
@@ -610,7 +553,7 @@ class CancelSessionAction extends AbstractInlineChatAction {
             },
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                when: ( ContextKeyExpr.or(( CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("preview" )), ( CTX_INLINE_CHAT_RESPONSE_TYPES.isEqualTo("onlyMessages" )))),
+                when: ( CTX_INLINE_CHAT_EDIT_MODE.isEqualTo("preview" )),
                 group: '0_main',
                 order: 3
             }
@@ -620,6 +563,54 @@ class CancelSessionAction extends AbstractInlineChatAction {
         ctrl.cancelSession();
     }
 }
+class CloseAction extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: 'inlineChat.close',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
+                'close',
+                'Close'
+            )),
+            icon: Codicon.close,
+            precondition: CTX_INLINE_CHAT_VISIBLE,
+            keybinding: {
+                weight: 100  - 1,
+                primary: 9
+            },
+            menu: {
+                id: MENU_INLINE_CHAT_WIDGET,
+                group: 'main',
+                order: 0,
+            }
+        });
+    }
+    async runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
+        ctrl.finishExistingSession();
+    }
+}
+class ConfigureInlineChatAction extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: 'inlineChat.configure',
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
+                'configure',
+                'Configure '
+            )),
+            icon: Codicon.settingsGear,
+            precondition: CTX_INLINE_CHAT_VISIBLE,
+            menu: {
+                id: MENU_INLINE_CHAT_WIDGET,
+                group: 'config',
+                order: 1,
+            }
+        });
+    }
+    async runInlineChatCommand(accessor, ctrl, _editor, ..._args) {
+        accessor.get(IPreferencesService).openSettings({ query: 'inlineChat' });
+    }
+}
 class CopyRecordings extends AbstractInlineChatAction {
     constructor() {
         super({
@@ -676,7 +667,7 @@ class ViewInChatAction extends AbstractInlineChatAction {
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                when: ( CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.isEqualTo("message" )),
+                when: ( CTX_INLINE_CHAT_RESPONSE_TYPES.isEqualTo("onlyMessages" )),
                 group: '0_main',
                 order: 1
             }
@@ -699,7 +690,7 @@ class ExpandMessageAction extends AbstractInlineChatAction {
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE,
-                when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.isEqualTo('message')), ( CTX_INLINE_CHAT_MESSAGE_CROP_STATE.isEqualTo('cropped')))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( CTX_INLINE_CHAT_RESPONSE_TYPES.isEqualTo("onlyMessages" )), ( CTX_INLINE_CHAT_RESPONSE_TYPES.isEqualTo("mixed" )))), ( CTX_INLINE_CHAT_MESSAGE_CROP_STATE.isEqualTo('cropped')))),
                 group: '2_expandOrContract',
                 order: 1
             }
@@ -722,7 +713,7 @@ class ContractMessageAction extends AbstractInlineChatAction {
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: {
                 id: MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE,
-                when: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.isEqualTo('message')), ( CTX_INLINE_CHAT_MESSAGE_CROP_STATE.isEqualTo('expanded')))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( CTX_INLINE_CHAT_RESPONSE_TYPES.isEqualTo("onlyMessages" )), ( CTX_INLINE_CHAT_RESPONSE_TYPES.isEqualTo("mixed" )))), ( CTX_INLINE_CHAT_MESSAGE_CROP_STATE.isEqualTo('expanded')))),
                 group: '2_expandOrContract',
                 order: 1
             }
@@ -745,4 +736,4 @@ class InlineAccessibilityHelpContribution extends Disposable {
     }
 }
 
-export { ApplyPreviewEdits, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, ContractMessageAction, CopyRecordings, DiscardAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, ExpandMessageAction, FeebackHelpfulCommand, FeebackUnhelpfulCommand, FocusInlineChat, InlineAccessibilityHelpContribution, LOCALIZED_START_INLINE_CHAT_STRING, MakeRequestAction, NextFromHistory, PreviousFromHistory, ReRunRequestAction, ReportIssueForBugCommand, StartSessionAction, StopRequestAction, ToggleDiffForChange, ToggleInlineDiff, UnstashSessionAction, ViewInChatAction };
+export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, CloseAction, ConfigureInlineChatAction, ContractMessageAction, CopyRecordings, DiscardAction, DiscardHunkAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, ExpandMessageAction, FeebackHelpfulCommand, FeebackUnhelpfulCommand, FocusInlineChat, InlineAccessibilityHelpContribution, MakeRequestAction, NextFromHistory, PreviousFromHistory, ReRunRequestAction, ReportIssueForBugCommand, StopRequestAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };

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

@@ -4,7 +4,7 @@ import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession';
+import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService';
 import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
@@ -12,17 +12,27 @@ let InlineChatNotebookContribution = class InlineChatNotebookContribution {
     constructor(sessionService, notebookEditorService) {
         this._store = ( new DisposableStore());
         this._store.add(sessionService.registerSessionKeyComputer(Schemas.vscodeNotebookCell, {
-            getComparisonKey: (_editor, uri) => {
+            getComparisonKey: (editor, uri) => {
                 const data = CellUri.parse(uri);
                 if (!data) {
-                    throw illegalState('Expected notebook');
+                    throw illegalState('Expected notebook cell uri');
                 }
-                for (const editor of notebookEditorService.listNotebookEditors()) {
-                    if (isEqual(editor.textModel?.uri, data.notebook)) {
-                        return `<notebook>${editor.getId()}#${uri}`;
+                let fallback;
+                for (const notebookEditor of notebookEditorService.listNotebookEditors()) {
+                    if (notebookEditor.hasModel() && isEqual(notebookEditor.textModel.uri, data.notebook)) {
+                        const candidate = `<notebook>${notebookEditor.getId()}#${uri}`;
+                        if (!fallback) {
+                            fallback = candidate;
+                        }
+                        if (notebookEditor.codeEditors.find((tuple) => tuple[1] === editor)) {
+                            return candidate;
+                        }
                     }
                 }
-                throw illegalState('Expected notebook');
+                if (fallback) {
+                    return fallback;
+                }
+                throw illegalState('Expected notebook editor');
             }
         }));
         this._store.add(sessionService.onWillStartSession(newSessionEditor => {