@codingame/monaco-vscode-chat-service-override 31.0.0 → 32.0.0

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

@@ -20,7 +20,7 @@ var PhraseTextType;
 })(PhraseTextType || (PhraseTextType = {}));
 const VoiceChatInProgress = ( new RawContextKey("voiceChatInProgress", false, {
     type: "boolean",
-    description: ( localize(7816, "A speech-to-text session is in progress for chat."))
+    description: ( localize(8144, "A speech-to-text session is in progress for chat."))
 }));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static {

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

@@ -0,0 +1,30 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+/**
+ * Encapsulates workspace folder resolution with an optional working directory override.
+ *
+ * When a working directory is set (agents window), it takes priority over
+ * workspace folders for all folder-related operations. Otherwise, the class
+ * delegates to the underlying {@link IWorkspaceContextService}.
+ */
+export declare class WorkingDirectory {
+    private readonly _workspaceContextService;
+    private readonly _uri?;
+    constructor(_workspaceContextService: IWorkspaceContextService, _uri?: URI | undefined);
+    /** The explicit working directory URI, if set. */
+    get uri(): URI | undefined;
+    /** Whether an explicit working directory is set. */
+    get hasExplicitWorkingDirectory(): boolean;
+    /**
+     * Returns the workspace folder containing the given resource.
+     * When a working directory is set, only checks against it.
+     * Otherwise falls back to workspace context service.
+     */
+    getFolder(resource: URI): URI | undefined;
+    /**
+     * Resolves a workspace-relative file path to a URI.
+     * When a working directory is set, resolves against it.
+     * Otherwise resolves against the first workspace folder.
+     */
+    resolveRelativePath(filePath: string): URI | undefined;
+}

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

@@ -0,0 +1,35 @@
+
+import { extUriBiasedIgnorePathCase, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+
+class WorkingDirectory {
+    constructor(_workspaceContextService, _uri) {
+        this._workspaceContextService = _workspaceContextService;
+        this._uri = _uri;
+    }
+    get uri() {
+        return this._uri;
+    }
+    get hasExplicitWorkingDirectory() {
+        return !!this._uri;
+    }
+    getFolder(resource) {
+        if (this._uri) {
+            return extUriBiasedIgnorePathCase.isEqualOrParent(resource, this._uri)
+                ? this._uri
+                : undefined;
+        }
+        return this._workspaceContextService.getWorkspaceFolder(resource)?.uri;
+    }
+    resolveRelativePath(filePath) {
+        if (this._uri) {
+            return joinPath(this._uri, filePath);
+        }
+        const folders = this._workspaceContextService.getWorkspace().folders;
+        if (folders.length > 0) {
+            return folders[0].toResource(filePath);
+        }
+        return undefined;
+    }
+}
+
+export { WorkingDirectory };

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryServiceImpl.d.ts

@@ -1,6 +1,6 @@
 import { EditSuggestionId } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IEditTelemetryCodeAcceptedData, IEditTelemetryCodeSuggestedData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService";
+import { IEditTelemetryCodeAcceptedData, IEditTelemetryCodeRejectedData, IEditTelemetryCodeSuggestedData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService";
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 import { IRandomService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/randomService.service";
 export declare class AiEditTelemetryServiceImpl implements IAiEditTelemetryService {
@@ -11,4 +11,5 @@ export declare class AiEditTelemetryServiceImpl implements IAiEditTelemetryServi
     constructor(instantiationService: IInstantiationService, _randomService: IRandomService);
     createSuggestionId(data: Omit<IEditTelemetryCodeSuggestedData, "suggestionId">): EditSuggestionId;
     handleCodeAccepted(data: IEditTelemetryCodeAcceptedData): void;
+    handleCodeRejected(data: IEditTelemetryCodeRejectedData): void;
 }

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryServiceImpl.js

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { EditSuggestionId } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { escapeModelIdForTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
 import { DataChannelForwardingTelemetryService, forwardToChannelIf, isCopilotLikeExtension } from '@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/browser/forwardingTelemetryService';
 import { IRandomService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/randomService.service';
 
@@ -27,8 +28,9 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             editLinesInserted: data.editDeltaInfo?.linesAdded,
             editLinesDeleted: data.editDeltaInfo?.linesRemoved,
             modeId: data.modeId,
-            modelId: data.modelId?.replace(/[\/\\]/g, "|"),
+            modelId: escapeModelIdForTelemetry(data.modelId),
             applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
+            sourceRequestId: data.sourceRequestId,
             ...forwardToChannelIf(isCopilotLikeExtension(data.source?.extensionId))
         });
         return suggestionId;
@@ -48,12 +50,35 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             editLinesInserted: data.editDeltaInfo?.linesAdded,
             editLinesDeleted: data.editDeltaInfo?.linesRemoved,
             modeId: data.modeId,
-            modelId: data.modelId?.replace(/[\/\\]/g, "|"),
+            modelId: escapeModelIdForTelemetry(data.modelId),
             applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
+            sourceRequestId: data.sourceRequestId,
             acceptanceMethod: data.acceptanceMethod,
             ...forwardToChannelIf(isCopilotLikeExtension(data.source?.extensionId))
         });
     }
+    handleCodeRejected(data) {
+        this._telemetryService.publicLog2("editTelemetry.codeRejected", {
+            eventId: this._randomService.generatePrefixedUuid("evt"),
+            suggestionId: data.suggestionId,
+            presentation: data.presentation,
+            feature: data.feature,
+            sourceExtensionId: data.source?.extensionId,
+            sourceExtensionVersion: data.source?.extensionVersion,
+            sourceProviderId: data.source?.providerId,
+            languageId: data.languageId,
+            editCharsInserted: data.editDeltaInfo?.charsAdded,
+            editCharsDeleted: data.editDeltaInfo?.charsRemoved,
+            editLinesInserted: data.editDeltaInfo?.linesAdded,
+            editLinesDeleted: data.editDeltaInfo?.linesRemoved,
+            modeId: data.modeId,
+            modelId: escapeModelIdForTelemetry(data.modelId),
+            applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
+            sourceRequestId: data.sourceRequestId,
+            rejectionMethod: data.rejectionMethod,
+            ...forwardToChannelIf(isCopilotLikeExtension(data.source?.extensionId))
+        });
+    }
 };
 AiEditTelemetryServiceImpl = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IRandomService))], AiEditTelemetryServiceImpl));
 

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

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

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

@@ -1,24 +1,16 @@
 
-import './inlineChatDefaultModel.js';
 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 { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { KeepSessionAction2, UndoSessionAction2, UndoAndCloseSessionAction2, CancelSessionAction, ContinueInlineChatInChatViewAction, RephraseInlineChatSessionAction, StartSessionAction, AskInChatAction, FocusInlineChat, SubmitInlineChatInputAction, QueueInChatAction, HideInlineChatInputAction, FixDiagnosticsAction, DismissEditorAffordanceAction } from './inlineChatActions.js';
-import { CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { KeepSessionAction2, UndoAndCloseSessionAction2, CancelSessionAction, ContinueInlineChatInChatViewAction, RephraseInlineChatSessionAction, StartSessionAction, AskInChatAction, FocusInlineChat, FixDiagnosticsAction, DismissEditorAffordanceAction } from './inlineChatActions.js';
 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 { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { InlineChatEnabler, InlineChatEscapeToolContribution } from './inlineChatSessionServiceImpl.js';
-import './inlineChatHistoryService.js';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { InlineChatAccessibilityHelp } from './inlineChatAccessibilityHelp.js';
+import { InlineChatDefaultModel } from './inlineChatDefaultModel.js';
 
 registerEditorContribution(
     InlineChatController.ID,
@@ -26,52 +18,25 @@ registerEditorContribution(
     EditorContributionInstantiation.Eager
 );
 registerAction2(KeepSessionAction2);
-registerAction2(UndoSessionAction2);
 registerAction2(UndoAndCloseSessionAction2);
 registerAction2(CancelSessionAction);
 registerAction2(ContinueInlineChatInChatViewAction);
 registerAction2(RephraseInlineChatSessionAction);
-const editActionMenuItem = {
-    group: "0_main",
-    order: 0,
-    command: {
-        id: ChatSubmitAction.ID,
-        title: ( localize(10063, "Edit Code"))
-    },
-    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED))
-};
-const generateActionMenuItem = {
-    group: "0_main",
-    order: 0,
-    command: {
-        id: ChatSubmitAction.ID,
-        title: ( localize(10064, "Generate"))
-    },
-    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_V1_ENABLED))
-};
-MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, editActionMenuItem);
-MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, generateActionMenuItem);
-const cancelActionMenuItem = {
-    group: "0_main",
-    order: 0,
-    command: {
-        id: CancelAction.ID,
-        title: ( localize(10065, "Cancel Request")),
-        shortTitle: ( localize(10066, "Cancel"))
-    },
-    when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))
-};
-MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, cancelActionMenuItem);
 registerAction2(StartSessionAction);
 registerAction2(AskInChatAction);
 registerAction2(FocusInlineChat);
-registerAction2(SubmitInlineChatInputAction);
-registerAction2(QueueInChatAction);
-registerAction2(HideInlineChatInputAction);
 registerAction2(FixDiagnosticsAction);
 registerAction2(DismissEditorAffordanceAction);
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
+registerWorkbenchContribution2(
+    "inlineChat.notebooks",
+    InlineChatNotebookContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    InlineChatDefaultModel.ID,
+    InlineChatDefaultModel,
+    WorkbenchPhase.BlockRestore
+);
 registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(
     InlineChatEscapeToolContribution.Id,

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

@@ -3,7 +3,6 @@ import { EditorAction2 } from "@codingame/monaco-vscode-api/vscode/vs/editor/bro
 import { InlineChatController } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController";
 import { Action2, IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-export declare const START_INLINE_CHAT: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
 export declare class StartSessionAction extends Action2 {
     constructor();
     run(accessor: ServicesAccessor, ...args: unknown[]): any;
@@ -31,9 +30,6 @@ declare class KeepOrUndoSessionAction extends AbstractInlineChatAction {
 export declare class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor();
 }
-export declare class UndoSessionAction2 extends KeepOrUndoSessionAction {
-    constructor();
-}
 export declare class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor();
 }
@@ -48,14 +44,6 @@ export declare class RephraseInlineChatSessionAction extends AbstractInlineChatA
     constructor();
     runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor): Promise<void>;
 }
-export declare class SubmitInlineChatInputAction extends AbstractInlineChatAction {
-    constructor();
-    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: unknown[]): void;
-}
-export declare class HideInlineChatInputAction extends AbstractInlineChatAction {
-    constructor();
-    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController, _editor: ICodeEditor, ..._args: unknown[]): void;
-}
 export declare class AskInChatAction extends EditorAction2 {
     constructor();
     runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
@@ -64,8 +52,4 @@ export declare class DismissEditorAffordanceAction extends EditorAction2 {
     constructor();
     runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor): void;
 }
-export declare class QueueInChatAction extends AbstractInlineChatAction {
-    constructor();
-    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController, editor: ICodeEditor): Promise<void>;
-}
 export {};

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

@@ -7,7 +7,7 @@ import { EmbeddedDiffEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs
 import { EmbeddedCodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { InlineChatController, InlineChatRunOptions } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_POSSIBLE, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED, ACTION_START, InlineChatConfigKeys, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FOCUSED, CTX_FIX_DIAGNOSTICS_ENABLED, CTX_HOVER_MODE, CTX_INLINE_CHAT_PENDING_CONFIRMATION, CTX_INLINE_CHAT_TERMINATED, CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, CTX_INLINE_CHAT_INPUT_HAS_TEXT, ACTION_ASK_IN_CHAT, CTX_INLINE_CHAT_AFFORDANCE_VISIBLE } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE, CTX_INLINE_CHAT_V2_ENABLED, CTX_INLINE_CHAT_POSSIBLE, CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED, ACTION_START, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_FOCUSED, CTX_FIX_DIAGNOSTICS_ENABLED, CTX_INLINE_CHAT_TERMINATED, ACTION_ASK_IN_CHAT, CTX_INLINE_CHAT_AFFORDANCE_VISIBLE } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ctxHasRequestInProgress, ctxHasEditorModification } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Action2, MenuId, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -21,22 +21,21 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatRequestQueueKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ChatEntitlementContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 CommandsRegistry.registerCommandAlias("interactiveEditor.start", "inlineChat.start");
-CommandsRegistry.registerCommandAlias("interactive.acceptChanges", ACTION_ACCEPT_CHANGES);
-const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(10067, "Icon which spawns the inline chat from the editor toolbar.")));
-const inlineChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.or(CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED)), CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate())));
+const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(10403, "Icon which spawns the inline chat from the editor toolbar.")));
+const inlineChatNotebooksOldEnabled = ( ContextKeyExpr.or(( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE))));
+const inlineChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.or(inlineChatNotebooksOldEnabled, CTX_INLINE_CHAT_V2_ENABLED)), CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate())));
 class StartSessionAction extends Action2 {
     constructor() {
         super({
             id: ACTION_START,
-            title: ( localize2(10068, "Open Inline Chat")),
-            shortTitle: ( localize2(10069, "Inline Chat")),
+            title: ( localize2(10404, "Open Inline Chat")),
+            shortTitle: ( localize2(10405, "Inline Chat")),
             category: AbstractInlineChatAction.category,
             f1: true,
             precondition: ( ContextKeyExpr.and(inlineChatContextKey, ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate()))))),
@@ -80,7 +79,6 @@ class StartSessionAction extends Action2 {
         });
     }
     async _runEditorCommand(accessor, editor, ...args) {
-        const configServce = accessor.get(IConfigurationService);
         const ctrl = InlineChatController.get(editor);
         if (!ctrl) {
             return;
@@ -90,12 +88,6 @@ class StartSessionAction extends Action2 {
         if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
             options = arg;
         }
-        if (!options?.message && configServce.getValue(InlineChatConfigKeys.RenderMode) === "hover") {
-            const selection = editor.getSelection();
-            const placeholder = selection && !selection.isEmpty() ? ( localize(10070, "Describe how to change this")) : ( localize(10071, "Describe what to generate"));
-            await ctrl.inputOverlayWidget.showMenuAtSelection(placeholder);
-            return;
-        }
         await ctrl?.run({
             ...options
         });
@@ -112,8 +104,8 @@ MenuRegistry.appendMenuItem(MenuId.InlineChatEditorAffordance, {
     )),
     command: {
         id: ACTION_START,
-        title: ( localize(10072, "Ask for Edits")),
-        shortTitle: ( localize(10073, "Ask for Edits")),
+        title: ( localize(10406, "Ask for Edits")),
+        shortTitle: ( localize(10407, "Ask for Edits")),
         icon: Codicon.sparkle
     }
 });
@@ -121,7 +113,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: "inlineChat.focus",
-            title: ( localize2(10074, "Focus Input")),
+            title: ( localize2(10408, "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()))),
@@ -142,7 +134,7 @@ class FocusInlineChat extends EditorAction2 {
 }
 class AbstractInlineChatAction extends EditorAction2 {
     static {
-        this.category = ( localize2(10075, "Inline Chat"));
+        this.category = ( localize2(10409, "Inline Chat"));
     }
     constructor(desc) {
         const massageMenu = menu => {
@@ -208,7 +200,7 @@ class FixDiagnosticsAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.fixDiagnostics",
-            title: ( localize2(10076, "Fix")),
+            title: ( localize2(10410, "Fix")),
             icon: Codicon.editSparkle,
             precondition: ( ContextKeyExpr.and(
                 CTX_FIX_DIAGNOSTICS_ENABLED,
@@ -243,7 +235,6 @@ class FixDiagnosticsAction extends AbstractInlineChatAction {
         });
     }
     runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
-        ctrl.inputWidget.hide();
         ctrl.run({
             autoSend: true,
             attachDiagnostics: true
@@ -270,7 +261,7 @@ class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(true, {
             id: "inlineChat2.keep",
-            title: ( localize2(10077, "Keep")),
+            title: ( localize2(10411, "Keep")),
             f1: true,
             icon: Codicon.check,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification)),
@@ -291,33 +282,11 @@ class KeepSessionAction2 extends KeepOrUndoSessionAction {
         });
     }
 }
-class UndoSessionAction2 extends KeepOrUndoSessionAction {
-    constructor() {
-        super(false, {
-            id: "inlineChat2.undo",
-            title: ( localize2(10078, "Undo")),
-            f1: true,
-            icon: Codicon.discard,
-            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_HOVER_MODE)),
-            keybinding: [{
-                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(EditorContextKeys.focus, ( ctxHasEditorModification.negate()))), ChatContextKeys.inputHasFocus)),
-                weight: KeybindingWeight.WorkbenchContrib + 1,
-                primary: KeyCode.Escape
-            }],
-            menu: [{
-                id: MenuId.ChatEditorInlineExecute,
-                group: "navigation",
-                order: 100,
-                when: ( ContextKeyExpr.and(CTX_HOVER_MODE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification))
-            }]
-        });
-    }
-}
 class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.close",
-            title: ( localize2(10079, "Close")),
+            title: ( localize2(10412, "Close")),
             f1: true,
             icon: Codicon.close,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
@@ -329,8 +298,7 @@ class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
             menu: [{
                 id: MenuId.ChatEditorInlineExecute,
                 group: "navigation",
-                order: 100,
-                when: ( ContextKeyExpr.or(( CTX_HOVER_MODE.negate()), ( ContextKeyExpr.and(CTX_HOVER_MODE, ( ctxHasEditorModification.negate()), ( ctxHasRequestInProgress.negate()))), ( ContextKeyExpr.and(CTX_HOVER_MODE, CTX_INLINE_CHAT_PENDING_CONFIRMATION))))
+                order: 100
             }]
         });
     }
@@ -339,19 +307,14 @@ class CancelSessionAction extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.cancel",
-            title: ( localize2(10080, "Cancel")),
+            title: ( localize2(10413, "Cancel")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ctxHasRequestInProgress)),
             keybinding: [{
                 when: ( ContextKeyExpr.or(EditorContextKeys.focus, ChatContextKeys.inputHasFocus)),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
                 primary: KeyCode.Escape
             }],
-            menu: [{
-                id: MenuId.ChatEditorInlineExecute,
-                group: "navigation",
-                order: 100,
-                when: ( ContextKeyExpr.and(CTX_HOVER_MODE, ctxHasRequestInProgress))
-            }]
+            menu: []
         });
     }
 }
@@ -359,7 +322,7 @@ class ContinueInlineChatInChatViewAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat2.continueInChat",
-            title: ( localize2(10081, "Ask in Chat")),
+            title: ( localize2(10414, "Ask in Chat")),
             icon: Codicon.chatSparkle,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_TERMINATED)),
             menu: [{
@@ -378,7 +341,7 @@ class RephraseInlineChatSessionAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat2.rephrase",
-            title: ( localize2(10082, "Rephrase")),
+            title: ( localize2(10415, "Rephrase")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_TERMINATED)),
             menu: [{
                 id: MenuId.ChatEditorInlineExecute,
@@ -392,64 +355,11 @@ class RephraseInlineChatSessionAction extends AbstractInlineChatAction {
         await ctrl.rephraseSession();
     }
 }
-class SubmitInlineChatInputAction extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: "inlineChat.submitInput",
-            title: ( localize2(10083, "Send")),
-            icon: Codicon.send,
-            precondition: ( ContextKeyExpr.and(
-                CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
-                CTX_INLINE_CHAT_INPUT_HAS_TEXT,
-                ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate())))
-            )),
-            keybinding: {
-                when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED, ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate()))))),
-                weight: KeybindingWeight.EditorCore + 10,
-                primary: KeyCode.Enter
-            },
-            menu: [{
-                id: MenuId.InlineChatInput,
-                group: "0_main",
-                order: 1,
-                when: ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate())))
-            }]
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
-        const value = ctrl.inputWidget.value;
-        if (value) {
-            ctrl.inputWidget.addToHistory(value);
-            ctrl.inputWidget.hide();
-            ctrl.run({
-                message: value,
-                autoSend: true
-            });
-        }
-    }
-}
-class HideInlineChatInputAction extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: "inlineChat.hideInput",
-            title: ( localize2(10084, "Hide Input")),
-            precondition: CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
-            keybinding: {
-                when: CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
-                weight: KeybindingWeight.EditorCore + 10,
-                primary: KeyCode.Escape
-            }
-        });
-    }
-    runInlineChatCommand(_accessor, ctrl, _editor, ..._args) {
-        ctrl.inputWidget.hide();
-    }
-}
 class AskInChatAction extends EditorAction2 {
     constructor() {
         super({
             id: ACTION_ASK_IN_CHAT,
-            title: ( localize2(10085, "Ask in Chat")),
+            title: ( localize2(10416, "Ask in Chat")),
             category: AbstractInlineChatAction.category,
             f1: true,
             precondition: ( ContextKeyExpr.and(
@@ -486,13 +396,21 @@ class AskInChatAction extends EditorAction2 {
     }
     async runEditorCommand(accessor, editor) {
         const chatEditingService = accessor.get(IChatEditingService);
-        const ctrl = InlineChatController.get(editor);
-        if (!ctrl || !editor.hasModel()) {
+        const chatWidgetService = accessor.get(IChatWidgetService);
+        if (!editor.hasModel()) {
+            return;
+        }
+        const session = chatEditingService.editingSessionsObs.get().find(s => s.getEntry(editor.getModel().uri));
+        if (!session) {
+            return;
+        }
+        const widget = await chatWidgetService.openSession(session.chatSessionResource);
+        if (!widget) {
             return;
         }
-        const entry = chatEditingService.editingSessionsObs.get().find(value => value.getEntry(editor.getModel().uri));
-        if (entry) {
-            ctrl.inputOverlayWidget.showMenuAtSelection(( localize(10086, "Describe how to proceed in Chat")));
+        const selection = editor.getSelection();
+        if (selection && !selection.isEmpty()) {
+            await widget.attachmentModel.addFile(editor.getModel().uri, selection);
         }
     }
 }
@@ -500,7 +418,7 @@ class DismissEditorAffordanceAction extends EditorAction2 {
     constructor() {
         super({
             id: "inlineChat.dismissEditorAffordance",
-            title: ( localize2(10087, "Dismiss Editor Affordance")),
+            title: ( localize2(10417, "Dismiss Editor Affordance")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_AFFORDANCE_VISIBLE, ( ContextKeyExpr.equals("config.inlineChat.affordance", "editor")))),
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,
@@ -513,65 +431,5 @@ class DismissEditorAffordanceAction extends EditorAction2 {
         InlineChatController.get(editor)?.inputOverlayWidget.dismiss();
     }
 }
-class QueueInChatAction extends AbstractInlineChatAction {
-    constructor() {
-        super({
-            id: "inlineChat.queueInChat",
-            title: ( localize2(10088, "Queue in Chat")),
-            icon: Codicon.arrowUp,
-            precondition: ( ContextKeyExpr.and(
-                CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
-                CTX_INLINE_CHAT_INPUT_HAS_TEXT,
-                CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT,
-                CTX_ASK_IN_CHAT_ENABLED
-            )),
-            keybinding: {
-                when: ( ContextKeyExpr.and(
-                    CTX_INLINE_CHAT_INPUT_WIDGET_FOCUSED,
-                    CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT,
-                    CTX_ASK_IN_CHAT_ENABLED
-                )),
-                weight: KeybindingWeight.EditorCore + 10,
-                primary: KeyCode.Enter
-            },
-            menu: [{
-                id: MenuId.InlineChatInput,
-                group: "0_main",
-                order: 1,
-                when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT, CTX_ASK_IN_CHAT_ENABLED))
-            }]
-        });
-    }
-    async runInlineChatCommand(accessor, ctrl, editor) {
-        const chatEditingService = accessor.get(IChatEditingService);
-        const chatWidgetService = accessor.get(IChatWidgetService);
-        if (!editor.hasModel()) {
-            return;
-        }
-        const value = ctrl.inputWidget.value;
-        if (value) {
-            ctrl.inputWidget.addToHistory(value);
-        }
-        ctrl.inputWidget.hide();
-        if (!value) {
-            return;
-        }
-        const session = chatEditingService.editingSessionsObs.get().find(s => s.getEntry(editor.getModel().uri));
-        if (!session) {
-            return;
-        }
-        const widget = await chatWidgetService.openSession(session.chatSessionResource);
-        if (!widget) {
-            return;
-        }
-        const selection = editor.getSelection();
-        if (selection && !selection.isEmpty()) {
-            await widget.attachmentModel.addFile(editor.getModel().uri, selection);
-        }
-        await widget.acceptInput(value, {
-            queue: ChatRequestQueueKind.Queued
-        });
-    }
-}
 
-export { AbstractInlineChatAction, AskInChatAction, CancelSessionAction, ContinueInlineChatInChatViewAction, DismissEditorAffordanceAction, FixDiagnosticsAction, FocusInlineChat, HideInlineChatInputAction, KeepSessionAction2, QueueInChatAction, RephraseInlineChatSessionAction, START_INLINE_CHAT, StartSessionAction, SubmitInlineChatInputAction, UndoAndCloseSessionAction2, UndoSessionAction2 };
+export { AbstractInlineChatAction, AskInChatAction, CancelSessionAction, ContinueInlineChatInChatViewAction, DismissEditorAffordanceAction, FixDiagnosticsAction, FocusInlineChat, KeepSessionAction2, RephraseInlineChatSessionAction, StartSessionAction, UndoAndCloseSessionAction2 };