@codingame/monaco-vscode-chat-service-override 2.2.1 → 3.0.0

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { CancellationToken, CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { Disposable, DisposableMap, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -8,20 +9,21 @@ import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { Severity, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { CONTEXT_PROVIDER_EXISTS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-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 { ChatModel, ChatWelcomeMessageModel, ChatModelInitState, getHistoryEntriesFromModel, updateRanges } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, getPromptText } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
-import { InteractiveSessionVoteDirection, ChatAgentCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+import { InteractiveSessionVoteDirection, ChatCopyKind } 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';
@@ -34,7 +36,7 @@ let ChatService = class ChatService extends Disposable {
     get transferredSessionData() {
         return this._transferredSessionData;
     }
-    constructor(storageService, logService, extensionService, instantiationService, telemetryService, contextKeyService, workspaceContextService, chatSlashCommandService, chatVariablesService, chatAgentService) {
+    constructor(storageService, logService, extensionService, instantiationService, telemetryService, contextKeyService, workspaceContextService, chatSlashCommandService, chatVariablesService, chatAgentService, notificationService, commandService) {
         super();
         this.storageService = storageService;
         this.logService = logService;
@@ -46,17 +48,20 @@ let ChatService = class ChatService extends Disposable {
         this.chatSlashCommandService = chatSlashCommandService;
         this.chatVariablesService = chatVariablesService;
         this.chatAgentService = chatAgentService;
+        this.notificationService = notificationService;
+        this.commandService = commandService;
         this._providers = ( new Map());
         this._sessionModels = this._register(( new DisposableMap()));
         this._pendingRequests = this._register(( new DisposableMap()));
         this._onDidPerformUserAction = this._register(( new Emitter()));
         this.onDidPerformUserAction = this._onDidPerformUserAction.event;
-        this._onDidSubmitAgent = this._register(( new Emitter()));
-        this.onDidSubmitAgent = this._onDidSubmitAgent.event;
         this._onDidDisposeSession = this._register(( new Emitter()));
         this.onDidDisposeSession = this._onDidDisposeSession.event;
         this._onDidRegisterProvider = this._register(( new Emitter()));
         this.onDidRegisterProvider = this._onDidRegisterProvider.event;
+        this._onDidUnregisterProvider = this._register(( new Emitter()));
+        this.onDidUnregisterProvider = this._onDidUnregisterProvider.event;
+        this._sessionFollowupCancelTokens = this._register(( new DisposableMap()));
         this._hasProvider = CONTEXT_PROVIDER_EXISTS.bindTo(this.contextKeyService);
         const sessionData = storageService.get(serializedChatKey, 1 , '');
         if (sessionData) {
@@ -77,6 +82,11 @@ let ChatService = class ChatService extends Disposable {
             this._transferredSessionData = { sessionId: transferredChat.sessionId, inputValue: transferredData.inputValue };
         }
         this._register(storageService.onWillSaveState(() => this.saveState()));
+        this._register(Event.debounce(this.chatAgentService.onDidChangeAgents, () => { }, 500)(() => {
+            for (const model of ( this._sessionModels.values())) {
+                this.warmSlashCommandCache(model);
+            }
+        }));
     }
     saveState() {
         let allSessions = Array.from(( this._sessionModels.values()))
@@ -105,7 +115,7 @@ let ChatService = class ChatService extends Disposable {
         else if (action.action.kind === 'copy') {
             this.telemetryService.publicLog2('interactiveSessionCopy', {
                 providerId: action.providerId,
-                copyKind: action.action.copyKind === ChatAgentCopyKind.Action ? 'action' : 'toolbar'
+                copyKind: action.action.copyKind === ChatCopyKind.Action ? 'action' : 'toolbar'
             });
         }
         else if (action.action.kind === 'insert') {
@@ -115,8 +125,8 @@ let ChatService = class ChatService extends Disposable {
             });
         }
         else if (action.action.kind === 'command') {
-            const command = CommandsRegistry.getCommand(action.action.command.commandId);
-            const commandId = command ? action.action.command.commandId : 'INVALID';
+            const command = CommandsRegistry.getCommand(action.action.commandButton.command.id);
+            const commandId = command ? action.action.commandButton.command.id : 'INVALID';
             this.telemetryService.publicLog2('interactiveSessionCommand', {
                 providerId: action.providerId,
                 commandId
@@ -187,11 +197,10 @@ let ChatService = class ChatService extends Disposable {
             .filter(session => !( this._sessionModels.has(session.sessionId)))
             .filter(session => !session.isImported)
             .map(item => {
-            const firstRequestMessage = item.requests[0]?.message;
+            const title = ChatModel.getDefaultTitle(item.requests);
             return {
                 sessionId: item.sessionId,
-                title: (typeof firstRequestMessage === 'string' ? firstRequestMessage :
-                    firstRequestMessage?.text) ?? '',
+                title
             };
         }));
     }
@@ -218,9 +227,14 @@ let ChatService = class ChatService extends Disposable {
         this.trace('reinitializeModel', `Start reinit`);
         this.initializeSession(model, CancellationToken.None);
     }
+    warmSlashCommandCache(model, agent) {
+        const agents = agent ? [agent] : this.chatAgentService.getAgents();
+        agents.forEach(agent => agent.provideSlashCommands(model, [], CancellationToken.None));
+    }
     async initializeSession(model, token) {
         try {
             this.trace('initializeSession', `Initialize session ${model.sessionId}`);
+            this.warmSlashCommandCache(model);
             model.startInitialize();
             await this.extensionService.activateByEvent(`onInteractiveSession:${model.providerId}`);
             const provider = this._providers.get(model.providerId);
@@ -238,8 +252,31 @@ let ChatService = class ChatService extends Disposable {
                 throw new Error('Provider returned no session');
             }
             this.trace('startSession', `Provider returned session`);
-            const welcomeMessage = model.welcomeMessage ? undefined : (await provider.provideWelcomeMessage?.(token)) ?? undefined;
-            const welcomeModel = welcomeMessage && ( new ChatWelcomeMessageModel(model, ( welcomeMessage.map(item => typeof item === 'string' ? ( new MarkdownString(item)) : item)), (await provider.provideSampleQuestions?.(token)) ?? []));
+            const defaultAgent = this.chatAgentService.getDefaultAgent();
+            if (!defaultAgent) {
+                this.notificationService.notify({
+                    severity: Severity.Error,
+                    message: ( localizeWithPath(
+                        'vs/workbench/contrib/chat/common/chatServiceImpl',
+                        'chatFailErrorMessage',
+                        "Chat failed to load. Please ensure that the GitHub Copilot Chat extension is up to date."
+                    )),
+                    actions: {
+                        primary: [
+                            ( new Action('showExtension', ( localizeWithPath(
+                                'vs/workbench/contrib/chat/common/chatServiceImpl',
+                                'action.showExtension',
+                                "Show Extension"
+                            )), undefined, true, () => {
+                                return this.commandService.executeCommand('workbench.extensions.action.showExtensionsWithIds', ['GitHub.copilot-chat']);
+                            }))
+                        ]
+                    }
+                });
+                throw new Error('No default agent');
+            }
+            const welcomeMessage = model.welcomeMessage ? undefined : (await defaultAgent.provideWelcomeMessage?.(token)) ?? undefined;
+            const welcomeModel = welcomeMessage && ( new ChatWelcomeMessageModel(model, ( welcomeMessage.map(item => typeof item === 'string' ? ( new MarkdownString(item)) : item)), (await defaultAgent.provideSampleQuestions?.(token)) ?? []));
             model.initialize(session, welcomeModel);
         }
         catch (err) {
@@ -292,10 +329,23 @@ let ChatService = class ChatService extends Disposable {
             this.trace('sendRequest', `Session ${sessionId} already has a pending request`);
             return;
         }
-        return { responseCompletePromise: this._sendRequestAsync(model, sessionId, provider, request) };
+        const parsedRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionId, request);
+        const agent = parsedRequest.parts.find((r) => r instanceof ChatRequestAgentPart)?.agent ?? this.chatAgentService.getDefaultAgent();
+        const agentSlashCommandPart = parsedRequest.parts.find((r) => r instanceof ChatRequestAgentSubcommandPart);
+        return {
+            responseCompletePromise: this._sendRequestAsync(model, sessionId, provider, parsedRequest),
+            agent,
+            slashCommand: agentSlashCommandPart?.command,
+        };
     }
-    async _sendRequestAsync(model, sessionId, provider, message) {
-        const parsedRequest = await this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionId, message);
+    refreshFollowupsCancellationToken(sessionId) {
+        this._sessionFollowupCancelTokens.get(sessionId)?.cancel();
+        const newTokenSource = ( new CancellationTokenSource());
+        this._sessionFollowupCancelTokens.set(sessionId, newTokenSource);
+        return newTokenSource.token;
+    }
+    async _sendRequestAsync(model, sessionId, provider, parsedRequest) {
+        const followupsCancelToken = this.refreshFollowupsCancellationToken(sessionId);
         let request;
         const agentPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r) => r instanceof ChatRequestAgentPart);
         const agentSlashCommandPart = 'kind' in parsedRequest ? undefined : parsedRequest.parts.find((r) => r instanceof ChatRequestAgentSubcommandPart);
@@ -334,50 +384,31 @@ let ChatService = class ChatService extends Disposable {
                 model.cancelRequest(request);
             });
             try {
-                if (agentPart && agentSlashCommandPart?.command) {
-                    this._onDidSubmitAgent.fire({ agent: agentPart.agent, slashCommand: agentSlashCommandPart.command, sessionId: model.sessionId });
-                }
-                let rawResponse;
+                let rawResult;
                 let agentOrCommandFollowups = undefined;
                 const defaultAgent = this.chatAgentService.getDefaultAgent();
                 if (agentPart || (defaultAgent && !commandPart)) {
                     const agent = (agentPart?.agent ?? defaultAgent);
-                    const history = [];
-                    for (const request of model.getRequests()) {
-                        if (!request.response) {
-                            continue;
-                        }
-                        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 } });
-                    }
-                    const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, model, token);
-                    request = model.addRequest(parsedRequest, variableData, agent, agentSlashCommandPart?.command);
+                    const history = getHistoryEntriesFromModel(model);
+                    const initVariableData = { variables: [] };
+                    request = model.addRequest(parsedRequest, initVariableData, agent, agentSlashCommandPart?.command);
+                    const variableData = await this.chatVariablesService.resolveVariables(parsedRequest, model, progressCallback, token);
+                    request.variableData = variableData;
+                    const promptTextResult = getPromptText(request.message);
                     const requestProps = {
                         sessionId,
                         requestId: request.id,
                         agentId: agent.id,
-                        message: variableData.message,
-                        variables: variableData.variables,
-                        command: agentSlashCommandPart?.command.name ?? '',
+                        message: promptTextResult.message,
+                        command: agentSlashCommandPart?.command.name,
+                        variables: updateRanges(variableData, promptTextResult.diff)
                     };
                     const agentResult = await this.chatAgentService.invokeAgent(agent.id, requestProps, progressCallback, history, token);
-                    rawResponse = {
-                        session: model.session,
-                        errorDetails: agentResult.errorDetails,
-                        timings: agentResult.timings
-                    };
-                    agentOrCommandFollowups = agentResult?.followUp ? Promise.resolve(agentResult.followUp) :
-                        this.chatAgentService.getFollowups(agent.id, sessionId, CancellationToken.None);
+                    rawResult = agentResult;
+                    agentOrCommandFollowups = this.chatAgentService.getFollowups(agent.id, requestProps, agentResult, followupsCancelToken);
                 }
                 else if (commandPart && this.chatSlashCommandService.hasCommand(commandPart.slashCommand.command)) {
-                    request = model.addRequest(parsedRequest, { message, variables: {} });
+                    request = model.addRequest(parsedRequest, { variables: [] });
                     const history = [];
                     for (const request of model.getRequests()) {
                         if (!request.response) {
@@ -386,11 +417,12 @@ let ChatService = class ChatService extends Disposable {
                         history.push({ role: 1 , content: request.message.text });
                         history.push({ role: 2 , content: request.response.response.asString() });
                     }
+                    const message = parsedRequest.text;
                     const commandResult = await this.chatSlashCommandService.executeCommand(commandPart.slashCommand.command, message.substring(commandPart.slashCommand.command.length + 1).trimStart(), ( new Progress(p => {
                         progressCallback(p);
                     })), history, token);
                     agentOrCommandFollowups = Promise.resolve(commandResult?.followUp);
-                    rawResponse = { session: model.session };
+                    rawResult = {};
                 }
                 else {
                     throw new Error(`Cannot handle request`);
@@ -399,39 +431,36 @@ let ChatService = class ChatService extends Disposable {
                     return;
                 }
                 else {
-                    if (!rawResponse) {
+                    if (!rawResult) {
                         this.trace('sendRequest', `Provider returned no response for session ${model.sessionId}`);
-                        rawResponse = { session: model.session, errorDetails: { message: ( localizeWithPath(
+                        rawResult = { errorDetails: { message: ( localizeWithPath(
                             'vs/workbench/contrib/chat/common/chatServiceImpl',
                             'emptyResponse',
                             "Provider returned null response"
                         )) } };
                     }
-                    const result = rawResponse.errorDetails?.responseIsFiltered ? 'filtered' :
-                        rawResponse.errorDetails && gotProgress ? 'errorWithOutput' :
-                            rawResponse.errorDetails ? 'error' :
+                    const result = rawResult.errorDetails?.responseIsFiltered ? 'filtered' :
+                        rawResult.errorDetails && gotProgress ? 'errorWithOutput' :
+                            rawResult.errorDetails ? 'error' :
                                 'success';
                     this.telemetryService.publicLog2('interactiveSessionProviderInvoked', {
                         providerId: provider.id,
-                        timeToFirstProgress: rawResponse.timings?.firstProgress,
-                        totalTime: rawResponse.timings?.totalElapsed,
+                        timeToFirstProgress: rawResult.timings?.firstProgress,
+                        totalTime: rawResult.timings?.totalElapsed,
                         result,
                         requestType,
                         agent: agentPart?.agent.id ?? '',
                         slashCommand: agentSlashCommandPart ? agentSlashCommandPart.command.name : commandPart?.slashCommand.command,
                         chatSessionId: model.sessionId
                     });
-                    model.setResponse(request, rawResponse);
+                    model.setResponse(request, rawResult);
                     this.trace('sendRequest', `Provider returned response for session ${model.sessionId}`);
+                    model.completeResponse(request);
                     if (agentOrCommandFollowups) {
                         agentOrCommandFollowups.then(followups => {
                             model.setFollowups(request, followups);
-                            model.completeResponse(request, rawResponse?.errorDetails);
                         });
                     }
-                    else {
-                        model.completeResponse(request, rawResponse?.errorDetails);
-                    }
                 }
             }
             finally {
@@ -472,9 +501,9 @@ let ChatService = class ChatService extends Disposable {
         }
         await model.waitForInitialization();
         const parsedRequest = typeof message === 'string' ?
-            await this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionId, message) :
+            this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(sessionId, message) :
             message;
-        const request = model.addRequest(parsedRequest, variableData || { message: parsedRequest.text, variables: {} });
+        const request = model.addRequest(parsedRequest, variableData || { variables: [] });
         if (typeof response.message === 'string') {
             model.acceptResponseProgress(request, { content: response.message, kind: 'content' });
         }
@@ -483,14 +512,11 @@ let ChatService = class ChatService extends Disposable {
                 model.acceptResponseProgress(request, part, true);
             }
         }
-        model.setResponse(request, {
-            session: model.session,
-            errorDetails: response.errorDetails,
-        });
+        model.setResponse(request, response.result || {});
         if (response.followups !== undefined) {
             model.setFollowups(request, response.followups);
         }
-        model.completeResponse(request, response.errorDetails);
+        model.completeResponse(request);
     }
     cancelCurrentRequestForSession(sessionId) {
         this.trace('cancelCurrentRequestForSession', `sessionId: ${sessionId}`);
@@ -528,6 +554,7 @@ let ChatService = class ChatService extends Disposable {
             Array.from(( this._sessionModels.values()))
                 .filter(model => model.providerId === provider.id)
                 .forEach(model => model.deinitialize());
+            this._onDidUnregisterProvider.fire({ providerId: provider.id });
         });
     }
     hasSessions(providerId) {
@@ -537,7 +564,6 @@ let ChatService = class ChatService extends Disposable {
         return ( Array.from(( this._providers.values())).map(provider => {
             return {
                 id: provider.id,
-                displayName: provider.displayName
             };
         }));
     }
@@ -567,7 +593,9 @@ ChatService = ( __decorate([
     ( __param(6, IWorkspaceContextService)),
     ( __param(7, IChatSlashCommandService)),
     ( __param(8, IChatVariablesService)),
-    ( __param(9, IChatAgentService))
+    ( __param(9, IChatAgentService)),
+    ( __param(10, INotificationService)),
+    ( __param(11, ICommandService))
 ], ChatService));
 
 export { ChatService };

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

@@ -1,18 +1,16 @@
 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, 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 { InlineAccessibilityHelpContribution, StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, MakeRequestAction, StopRequestAction, ReRunRequestAction, DiscardHunkAction, DiscardAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, CancelSessionAction, MoveToNextHunk, MoveToPreviousHunk, 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 { StartSessionAction, HoldToSpeak } from './inlineChatActions2.js';
 
-registerAction2(StartSessionAction);
-registerAction2(HoldToSpeak);
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController, 0 );
 registerEditorContribution(INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, InlineAccessibilityHelpContribution, 3 );
+registerAction2(StartSessionAction);
 registerAction2(CloseAction);
 registerAction2(ConfigureInlineChatAction);
 registerAction2(UnstashSessionAction);
@@ -24,6 +22,8 @@ registerAction2(DiscardAction);
 registerAction2(DiscardToClipboardAction);
 registerAction2(DiscardUndoToNewFileAction);
 registerAction2(CancelSessionAction);
+registerAction2(MoveToNextHunk);
+registerAction2(MoveToPreviousHunk);
 registerAction2(ArrowOutUpAction);
 registerAction2(ArrowOutDownAction);
 registerAction2(FocusInlineChat);

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

@@ -1,10 +1,11 @@
 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 } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController, InlineChatRunOptions } 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 { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 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';
@@ -23,7 +24,7 @@ import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/prefere
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
-const LOCALIZED_START_INLINE_CHAT_STRING = ( localizeWithPath(
+const LOCALIZED_START_INLINE_CHAT_STRING = ( localize2WithPath(
     'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
     'run',
     'Start Inline Chat'
@@ -33,15 +34,45 @@ const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( l
     'startInlineChat',
     'Icon which spawns the inline chat from the editor toolbar.'
 )));
+class StartSessionAction extends EditorAction2 {
+    constructor() {
+        super({
+            id: 'inlineChat.start',
+            title: LOCALIZED_START_INLINE_CHAT_STRING,
+            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
+        });
+    }
+    runEditorCommand(accessor, editor, ..._args) {
+        const ctrl = InlineChatController.get(editor);
+        if (!ctrl) {
+            return;
+        }
+        let options;
+        const arg = _args[0];
+        if (arg && InlineChatRunOptions.isInteractiveEditorOptions(arg)) {
+            options = arg;
+        }
+        InlineChatController.get(editor)?.run({ ...options });
+    }
+}
 class UnstashSessionAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.unstash',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
                 'unstash',
-                'Resume Last Dismissed Inline Chat'
-            )), original: 'Resume Last Dismissed Inline Chat' },
+                "Resume Last Dismissed Inline Chat"
+            )),
             category: AbstractInlineChatAction.category,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable)),
             keybinding: {
@@ -64,11 +95,11 @@ class UnstashSessionAction extends EditorAction2 {
     }
 }
 class AbstractInlineChatAction extends EditorAction2 {
-    static { this.category = { value: ( localizeWithPath(
+    static { this.category = ( localize2WithPath(
         'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
         'cat',
-        'Inline Chat'
-    )), original: 'Inline Chat' }; }
+        "Inline Chat"
+    )); }
     constructor(desc) {
         super({
             ...desc,
@@ -225,11 +256,11 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.focus',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
                 'focus',
-                'Focus Input'
-            )), original: 'Focus Input' },
+                "Focus Input"
+            )),
             f1: true,
             category: AbstractInlineChatAction.category,
             precondition: ( ContextKeyExpr.and(EditorContextKeys.editorTextFocus, CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_FOCUSED.negate()), ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()))),
@@ -508,11 +539,11 @@ class AcceptChanges extends AbstractInlineChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
                 'apply1',
-                'Accept Changes'
-            )), original: 'Accept Changes' },
+                "Accept Changes"
+            )),
             shortTitle: ( localizeWithPath(
                 'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
                 'apply2',
@@ -616,19 +647,58 @@ class ConfigureInlineChatAction extends AbstractInlineChatAction {
         accessor.get(IPreferencesService).openSettings({ query: 'inlineChat' });
     }
 }
+class MoveToNextHunk extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: 'inlineChat.moveToNextHunk',
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
+                'moveToNextHunk',
+                'Move to Next Change'
+            )),
+            precondition: CTX_INLINE_CHAT_VISIBLE,
+            f1: true,
+            keybinding: {
+                weight: 200 ,
+                primary: 65
+            }
+        });
+    }
+    runInlineChatCommand(accessor, ctrl, editor, ...args) {
+        ctrl.moveHunk(true);
+    }
+}
+class MoveToPreviousHunk extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: 'inlineChat.moveToPreviousHunk',
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
+                'moveToPreviousHunk',
+                'Move to Previous Change'
+            )),
+            f1: true,
+            precondition: CTX_INLINE_CHAT_VISIBLE,
+            keybinding: {
+                weight: 200 ,
+                primary: 1024  | 65
+            }
+        });
+    }
+    runInlineChatCommand(accessor, ctrl, editor, ...args) {
+        ctrl.moveHunk(false);
+    }
+}
 class CopyRecordings extends AbstractInlineChatAction {
     constructor() {
         super({
             id: 'inlineChat.copyRecordings',
             f1: true,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
-                    'copyRecordings',
-                    '(Developer) Write Exchange to Clipboard'
-                )),
-                original: '(Developer) Write Exchange to Clipboard'
-            }
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
+                'copyRecordings',
+                "(Developer) Write Exchange to Clipboard"
+            ))
         });
     }
     async runInlineChatCommand(accessor) {
@@ -741,4 +811,4 @@ class InlineAccessibilityHelpContribution extends Disposable {
     }
 }
 
-export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, CloseAction, ConfigureInlineChatAction, ContractMessageAction, CopyRecordings, DiscardAction, DiscardHunkAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, ExpandMessageAction, FeebackHelpfulCommand, FeebackUnhelpfulCommand, FocusInlineChat, InlineAccessibilityHelpContribution, LOCALIZED_START_INLINE_CHAT_STRING, MakeRequestAction, NextFromHistory, PreviousFromHistory, ReRunRequestAction, ReportIssueForBugCommand, START_INLINE_CHAT, StopRequestAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };
+export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, CloseAction, ConfigureInlineChatAction, ContractMessageAction, CopyRecordings, DiscardAction, DiscardHunkAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, ExpandMessageAction, FeebackHelpfulCommand, FeebackUnhelpfulCommand, FocusInlineChat, InlineAccessibilityHelpContribution, LOCALIZED_START_INLINE_CHAT_STRING, MakeRequestAction, MoveToNextHunk, MoveToPreviousHunk, NextFromHistory, PreviousFromHistory, ReRunRequestAction, ReportIssueForBugCommand, START_INLINE_CHAT, StartSessionAction, StopRequestAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };

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

@@ -71,13 +71,13 @@ let InlineChatSavingServiceImpl = class InlineChatSavingServiceImpl {
     _installSaveParticpant() {
         const queue = ( new Queue());
         const d1 = this._textFileService.files.addSaveParticipant({
-            participate: (model, context, progress, token) => {
-                return queue.queue(() => this._participate(model.textEditorModel?.uri, context.reason, progress, token));
+            participate: (model, ctx, progress, token) => {
+                return queue.queue(() => this._participate(ctx.savedFrom ?? model.textEditorModel?.uri, ctx.reason, progress, token));
             }
         });
         const d2 = this._workingCopyFileService.addSaveParticipant({
-            participate: (workingCopy, env, progress, token) => {
-                return queue.queue(() => this._participate(workingCopy.resource, env.reason, progress, token));
+            participate: (workingCopy, ctx, progress, token) => {
+                return queue.queue(() => this._participate(ctx.savedFrom ?? workingCopy.resource, ctx.reason, progress, token));
             }
         });
         this._saveParticipant.value = combinedDisposable(d1, d2, queue);