@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -1,9 +1,9 @@
 
 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 { InlineChatController2, InlineChatController1, InlineChatController } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { StopSessionAction2, RevealWidget, StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
-import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineChatController2, InlineChatController1, InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { KeepSessionAction2, UndoSessionAction2, CloseSessionAction2, RevealWidget, CancelRequestAction, StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_HAS_AGENT, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
@@ -11,9 +11,9 @@ import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { InlineChatAccessibleView } from './inlineChatAccessibleView.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { InlineChatEnabler } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
+import { InlineChatEnabler } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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/chatContextKeys';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
@@ -23,8 +23,11 @@ import { InlineChatExpandLineAction, ShowInlineChatHintAction, HideInlineChatHin
 registerEditorContribution(InlineChatController2.ID, InlineChatController2, EditorContributionInstantiation.Eager);
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController1, EditorContributionInstantiation.Eager);
 registerEditorContribution(InlineChatController.ID, InlineChatController, EditorContributionInstantiation.Eager);
-registerAction2(StopSessionAction2);
+registerAction2(KeepSessionAction2);
+registerAction2(UndoSessionAction2);
+registerAction2(CloseSessionAction2);
 registerAction2(RevealWidget);
+registerAction2(CancelRequestAction);
 registerAction2(InlineChatExpandLineAction);
 registerAction2(ShowInlineChatHintAction);
 registerAction2(HideInlineChatHintAction);
@@ -34,18 +37,18 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7151, "Edit Code")),
+        title: ( localize(7227, "Edit Code")),
     },
-    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING)),
+    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_HAS_AGENT)),
 };
 const generateActionMenuItem = {
     group: '0_main',
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7152, "Generate")),
+        title: ( localize(7228, "Generate")),
     },
-    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()))),
+    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_HAS_AGENT)),
 };
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, editActionMenuItem);
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, generateActionMenuItem);
@@ -54,8 +57,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(7153, "Cancel Request")),
-        shortTitle: ( localize(7154, "Cancel")),
+        title: ( localize(7229, "Cancel Request")),
+        shortTitle: ( localize(7230, "Cancel")),
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };

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

@@ -4,7 +4,7 @@ import { AccessibleViewType } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { getChatAccessibilityHelpProvider } from '../../chat/browser/actions/chatAccessibilityHelp.js';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 
 class InlineChatAccessibilityHelp {
     constructor() {

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

@@ -1,6 +1,6 @@
 
-import { InlineChatController } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView';

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

@@ -6,8 +6,8 @@ import { MouseTargetType } from '@codingame/monaco-vscode-api/vscode/vs/editor/b
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { InlineChatController } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_AGENT, ACTION_START, InlineChatConfigKeys } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_AGENT, ACTION_START, InlineChatConfigKeys } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { EditorAction2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -21,7 +21,7 @@ import { StandardTokenType } from '@codingame/monaco-vscode-api/vscode/vs/editor
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { KeyChord, KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import * as inlineChat from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css';
+import * as inlineChat from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
@@ -44,14 +44,14 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 
 var InlineChatHintsController_1;
 registerCss(inlineChat);
-const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7180, "Whether inline chat shows a contextual hint"))));
+const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7259, "Whether inline chat shows a contextual hint"))));
 const _inlineChatActionId = 'inlineChat.startWithCurrentLine';
 class InlineChatExpandLineAction extends EditorAction2 {
     constructor() {
         super({
             id: _inlineChatActionId,
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7181, "Start in Editor with Current Line")),
+            title: ( localize2(7260, "Start in Editor with Current Line")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
             keybinding: [{
@@ -94,7 +94,7 @@ class ShowInlineChatHintAction extends EditorAction2 {
         super({
             id: 'inlineChat.showHint',
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7182, "Show Inline Chat Hint")),
+            title: ( localize2(7261, "Show Inline Chat Hint")),
             f1: false,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
         });
@@ -195,7 +195,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             if (ghostState !== undefined || !kb || !position || !model || !textFocus) {
                 return undefined;
             }
-            if (model.getLanguageId() === PLAINTEXT_LANGUAGE_ID || model.getLanguageId() === 'markdown') {
+            if (model.getLanguageId() === PLAINTEXT_LANGUAGE_ID || model.getLanguageId() === 'markdown' || model.getLanguageId() === 'search-result') {
                 return undefined;
             }
             const emitter = store.add(( new Emitter()));
@@ -225,15 +225,15 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
                 this._ctxShowingHint.reset();
                 return;
             }
-            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7183, "Chat"));
+            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7262, "Chat"));
             const { position, isEol, isWhitespace, kb, model } = showData;
             const inlineClassName = ['a' , 'inline-chat-hint', 'inline-chat-hint-text'];
             let content;
             if (isWhitespace) {
-                content = '\u00a0' + ( localize(7184, "{0} to edit with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7263, "{0} to edit with {1}", kb, agentName));
             }
             else if (isEol) {
-                content = '\u00a0' + ( localize(7185, "{0} to continue with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7264, "{0} to continue with {1}", kb, agentName));
             }
             else {
                 content = '\u200a' + kb + '\u200a';
@@ -262,7 +262,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             getActions: () => [
                 toAction({
                     id: 'inlineChat.disableHint',
-                    label: ( localize(7186, "Disable Inline Chat Hint")),
+                    label: ( localize(7265, "Disable Inline Chat Hint")),
                     run: async () => {
                         await this._configurationService.updateValue(setting, false);
                     }
@@ -290,7 +290,7 @@ class HideInlineChatHintAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.hideHint',
-            title: ( localize2(7187, "Hide Inline Chat Hint")),
+            title: ( localize2(7266, "Hide Inline Chat Hint")),
             precondition: CTX_INLINE_CHAT_SHOWING_HINT,
             keybinding: {
                 weight: KeybindingWeight.EditorContrib - 10,

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

@@ -4,13 +4,13 @@ import { illegalState } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { InlineChatController } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { InlineChatController } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { NotebookMultiTextDiffEditor } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
+import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
+import { NotebookMultiTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
 
 let InlineChatNotebookContribution = class InlineChatNotebookContribution {
     constructor(sessionService, editorService, notebookEditorService) {

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.d.ts

@@ -1,6 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { CellDiffInfo } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
-import { INotebookEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { CellDiffInfo } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { INotebookEditor } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 export declare class NotebookModifiedCellDecorator extends Disposable {
     private readonly notebookEditor;
     private readonly decorators;

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js

@@ -1,7 +1,7 @@
 
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { overviewRulerModifiedForeground } from '@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { overviewRulerModifiedForeground } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 
 class NotebookModifiedCellDecorator extends Disposable {
     constructor(notebookEditor) {

package/vscode/src/vs/workbench/services/workspaces/common/workspaceUtils.d.ts

@@ -1,5 +1,3 @@
 import { IWorkspace } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
-import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-export declare function isChatTransferredWorkspace(workspace: IWorkspace, storageService: IStorageService): boolean;
 export declare function areWorkspaceFoldersEmpty(workspace: IWorkspace, fileService: IFileService): Promise<boolean>;

package/vscode/src/vs/workbench/services/workspaces/common/workspaceUtils.js

@@ -1,18 +1,5 @@
 
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 
-function isChatTransferredWorkspace(workspace, storageService) {
-    const workspaceUri = workspace.folders[0]?.uri;
-    if (!workspaceUri) {
-        return false;
-    }
-    const chatWorkspaceTransfer = storageService.getObject('chat.workspaceTransfer', StorageScope.PROFILE, []);
-    const toWorkspace = ( chatWorkspaceTransfer.map((item) => {
-        return { toWorkspace: ( URI.from(item.toWorkspace)) };
-    }));
-    return ( toWorkspace.some(item => ( item.toWorkspace.toString()) === ( workspaceUri.toString())));
-}
 async function areWorkspaceFoldersEmpty(workspace, fileService) {
     for (const folder of workspace.folders) {
         const folderStat = await fileService.resolve(folder.uri);
@@ -23,4 +10,4 @@ async function areWorkspaceFoldersEmpty(workspace, fileService) {
     return true;
 }
 
-export { areWorkspaceFoldersEmpty, isChatTransferredWorkspace };
+export { areWorkspaceFoldersEmpty };

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

@@ -1,10 +0,0 @@
-import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
-import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
-import { ISelectPromptOptions } from "./dialogs/askToSelectPrompt/askToSelectPrompt.js";
-export declare const ATTACH_PROMPT_ACTION_ID = "workbench.action.chat.attach.prompt";
-export interface IChatAttachPromptActionOptions extends Pick<ISelectPromptOptions, "resource" | "widget"> {
-}
-export declare class AttachPromptAction extends Action2 {
-    constructor();
-    run(accessor: ServicesAccessor, options: IChatAttachPromptActionOptions): Promise<void>;
-}

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.js

@@ -1,54 +0,0 @@
-
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
-import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
-import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { askToSelectPrompt } from './dialogs/askToSelectPrompt/askToSelectPrompt.js';
-
-const ATTACH_PROMPT_ACTION_ID = 'workbench.action.chat.attach.prompt';
-class AttachPromptAction extends Action2 {
-    constructor() {
-        super({
-            id: ATTACH_PROMPT_ACTION_ID,
-            title: ( localize2(4356, "Use Prompt")),
-            f1: false,
-            precondition: ChatContextKeys.enabled,
-            category: CHAT_CATEGORY,
-        });
-    }
-    async run(accessor, options) {
-        const fileService = accessor.get(IFileService);
-        const chatService = accessor.get(IChatService);
-        const labelService = accessor.get(ILabelService);
-        const viewsService = accessor.get(IViewsService);
-        const openerService = accessor.get(IOpenerService);
-        const dialogService = accessor.get(IDialogService);
-        const promptsService = accessor.get(IPromptsService);
-        const commandService = accessor.get(ICommandService);
-        const quickInputService = accessor.get(IQuickInputService);
-        const promptFiles = await promptsService.listPromptFiles();
-        await askToSelectPrompt({
-            ...options,
-            promptFiles,
-            chatService,
-            fileService,
-            viewsService,
-            labelService,
-            dialogService,
-            openerService,
-            commandService,
-            quickInputService,
-        });
-    }
-}
-
-export { ATTACH_PROMPT_ACTION_ID, AttachPromptAction };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/askToSelectPrompt.d.ts

@@ -1,25 +0,0 @@
-import { IChatWidget } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { IPromptPath } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
-import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
-import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
-import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
-import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
-import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
-import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
-export interface ISelectPromptOptions {
-    readonly resource?: URI;
-    readonly widget?: IChatWidget;
-    readonly promptFiles: readonly IPromptPath[];
-    readonly fileService: IFileService;
-    readonly chatService: IChatService;
-    readonly labelService: ILabelService;
-    readonly viewsService: IViewsService;
-    readonly openerService: IOpenerService;
-    readonly dialogService: IDialogService;
-    readonly commandService: ICommandService;
-    readonly quickInputService: IQuickInputService;
-}
-export declare const askToSelectPrompt: (options: ISelectPromptOptions) => Promise<void>;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/askToSelectPrompt.js

@@ -1,79 +0,0 @@
-
-import { DOCS_OPTION } from './constants.js';
-import { attachPrompts } from './utils/attachPrompts.js';
-import { handleButtonClick } from './utils/handleButtonClick.js';
-import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
-import { createPromptPickItem } from './utils/createPromptPickItem.js';
-import { createPlaceholderText } from './utils/createPlaceholderText.js';
-import { extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-
-const askToSelectPrompt = async (options) => {
-    const { promptFiles, resource, quickInputService, labelService } = options;
-    const fileOptions = ( promptFiles.map((promptFile) => {
-        return createPromptPickItem(promptFile, labelService);
-    }));
-    fileOptions.push(DOCS_OPTION);
-    let activeItem;
-    if (resource) {
-        activeItem = fileOptions.find((file) => {
-            return extUri.isEqual(file.value, resource);
-        });
-        if (!activeItem) {
-            activeItem = createPromptPickItem({
-                uri: resource,
-                type: 'local',
-            }, labelService);
-            fileOptions.push(activeItem);
-        }
-        fileOptions.sort((file1, file2) => {
-            if (extUri.isEqual(file1.value, resource)) {
-                return -1;
-            }
-            if (extUri.isEqual(file2.value, resource)) {
-                return 1;
-            }
-            return 0;
-        });
-    }
-    if (!activeItem) {
-        activeItem = fileOptions[0];
-    }
-    const quickPick = quickInputService.createQuickPick();
-    quickPick.activeItems = activeItem ? [activeItem] : [];
-    quickPick.placeholder = createPlaceholderText(options);
-    quickPick.canAcceptInBackground = true;
-    quickPick.matchOnDescription = true;
-    quickPick.items = fileOptions;
-    const { openerService } = options;
-    return await ( new Promise(resolve => {
-        const disposables = ( new DisposableStore());
-        let lastActiveWidget = options.widget;
-        disposables.add({
-            dispose() {
-                quickPick.dispose();
-                resolve();
-                lastActiveWidget?.focusInput();
-            },
-        });
-        disposables.add(quickPick.onDidAccept(async (event) => {
-            const { selectedItems } = quickPick;
-            assert(selectedItems.length === 1, `Only one item can be accepted, got '${selectedItems.length}'.`);
-            const selectedOption = selectedItems[0];
-            const docsSelected = (selectedOption === DOCS_OPTION);
-            if (docsSelected) {
-                await openerService.open(selectedOption.value);
-                return;
-            }
-            lastActiveWidget = await attachPrompts(selectedItems, options, quickPick.keyMods);
-            if (!event.inBackground) {
-                disposables.dispose();
-            }
-        }));
-        disposables.add(quickPick.onDidTriggerItemButton(handleButtonClick.bind(null, { quickPick, ...options })));
-        disposables.add(quickPick.onDidHide(disposables.dispose.bind(disposables)));
-        quickPick.show();
-    }));
-};
-
-export { askToSelectPrompt };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/constants.d.ts

@@ -1,7 +0,0 @@
-import { WithUriValue } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
-import { IQuickInputButton, IQuickPickItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
-export declare const SUPER_KEY_NAME: string;
-export declare const ALT_KEY_NAME: string;
-export declare const DOCS_OPTION: WithUriValue<IQuickPickItem>;
-export declare const EDIT_BUTTON: IQuickInputButton;
-export declare const DELETE_BUTTON: IQuickInputButton;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/constants.js

@@ -1,27 +0,0 @@
-
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { DOCUMENTATION_URL } from '../../../../../common/promptSyntax/constants.js';
-import { isWindows, isLinux } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-
-const SUPER_KEY_NAME = (isWindows || isLinux) ? 'Ctrl' : '⌘';
-const ALT_KEY_NAME = (isWindows || isLinux) ? 'Alt' : '⌥';
-const DOCS_OPTION = ( Object.freeze({
-    type: 'item',
-    label: ( localize(4357, 'Learn how to create reusable prompts')),
-    description: DOCUMENTATION_URL,
-    tooltip: DOCUMENTATION_URL,
-    value: ( URI.parse(DOCUMENTATION_URL)),
-}));
-const EDIT_BUTTON = ( Object.freeze({
-    tooltip: ( localize(4358, "edit ({0}-key + enter)", SUPER_KEY_NAME)),
-    iconClass: ThemeIcon.asClassName(Codicon.edit),
-}));
-const DELETE_BUTTON = ( Object.freeze({
-    tooltip: ( localize(4359, "delete")),
-    iconClass: ThemeIcon.asClassName(Codicon.trash),
-}));
-
-export { ALT_KEY_NAME, DELETE_BUTTON, DOCS_OPTION, EDIT_BUTTON, SUPER_KEY_NAME };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/attachPrompts.d.ts

@@ -1,5 +0,0 @@
-import { ISelectPromptOptions } from "../askToSelectPrompt.js";
-import { IChatWidget } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat";
-import { WithUriValue } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
-import { IKeyMods, IQuickPickItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
-export declare const attachPrompts: (files: readonly WithUriValue<IQuickPickItem>[], options: ISelectPromptOptions, keyMods: IKeyMods) => Promise<IChatWidget>;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/attachPrompts.js

@@ -1,53 +0,0 @@
-
-import { showChatView, showEditsView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { ACTION_ID_NEW_CHAT, ACTION_ID_NEW_EDIT_SESSION } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClearActions';
-
-const attachPrompts = async (files, options, keyMods) => {
-    const widget = await getChatWidgetObject(options, keyMods);
-    for (const file of files) {
-        widget
-            .attachmentModel
-            .promptInstructions
-            .add(file.value);
-    }
-    return widget;
-};
-const getChatWidgetObject = async (options, keyMods) => {
-    const { widget } = options;
-    const { alt, ctrlCmd } = keyMods;
-    if (ctrlCmd) {
-        return await openNewChat(options, alt);
-    }
-    if (!widget) {
-        return await showExistingChat(options, alt);
-    }
-    return widget;
-};
-const openNewChat = async (options, edits) => {
-    const { commandService, chatService, viewsService } = options;
-    if (chatService.unifiedViewEnabled === true) {
-        await commandService.executeCommand(ACTION_ID_NEW_CHAT);
-        const widget = await showChatView(viewsService);
-        assertDefined(widget, 'Chat widget must be defined.');
-        return widget;
-    }
-    (edits === true)
-        ? await commandService.executeCommand(ACTION_ID_NEW_EDIT_SESSION)
-        : await commandService.executeCommand(ACTION_ID_NEW_CHAT);
-    const widget = (edits === true)
-        ? await showEditsView(viewsService)
-        : await showChatView(viewsService);
-    assertDefined(widget, 'Chat widget must be defined.');
-    return widget;
-};
-const showExistingChat = async (options, edits) => {
-    const { chatService, viewsService } = options;
-    const widget = (edits && (chatService.unifiedViewEnabled === false))
-        ? await showEditsView(viewsService)
-        : await showChatView(viewsService);
-    assertDefined(widget, 'Revealed chat widget must be defined.');
-    return widget;
-};
-
-export { attachPrompts };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/createPlaceholderText.d.ts

@@ -1,2 +0,0 @@
-import { ISelectPromptOptions } from "../askToSelectPrompt.js";
-export declare const createPlaceholderText: (options: ISelectPromptOptions) => string;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/createPlaceholderText.js

@@ -1,19 +0,0 @@
-
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { SUPER_KEY_NAME, ALT_KEY_NAME } from '../constants.js';
-
-const createPlaceholderText = (options) => {
-    const { widget, chatService } = options;
-    let text = ( localize(4360, 'Select a prompt to use'));
-    if (widget === undefined) {
-        const superModifierNote = ( localize(4361, '{0}-key to use in new chat', SUPER_KEY_NAME));
-        const altOptionModifierNote = ( localize(4362, ' or {0}-key to use in Copilot Edits', ALT_KEY_NAME));
-        const openInEditsNote = (chatService.unifiedViewEnabled === true)
-            ? ''
-            : altOptionModifierNote;
-        text += ( localize(4363, ' (hold {0}{1})', superModifierNote, openInEditsNote));
-    }
-    return text;
-};
-
-export { createPlaceholderText };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/createPromptPickItem.d.ts

@@ -1,5 +0,0 @@
-import { WithUriValue } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
-import { IPromptPath } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
-import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
-import { IQuickPickItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
-export declare const createPromptPickItem: (promptFile: IPromptPath, labelService: ILabelService) => WithUriValue<IQuickPickItem>;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/createPromptPickItem.js

@@ -1,27 +0,0 @@
-
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { EDIT_BUTTON, DELETE_BUTTON } from '../constants.js';
-import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { getCleanPromptName } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
-
-const createPromptPickItem = (promptFile, labelService) => {
-    const { uri, type } = promptFile;
-    const fileWithoutExtension = getCleanPromptName(uri);
-    const description = (type === 'user')
-        ? ( localize(4364, 'User prompt'))
-        : labelService.getUriLabel(dirname(uri), { relative: true });
-    const tooltip = (type === 'user')
-        ? description
-        : uri.fsPath;
-    return {
-        id: ( uri.toString()),
-        type: 'item',
-        label: fileWithoutExtension,
-        description,
-        tooltip,
-        value: uri,
-        buttons: [EDIT_BUTTON, DELETE_BUTTON],
-    };
-};
-
-export { createPromptPickItem };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt/utils/handleButtonClick.d.ts

@@ -1,13 +0,0 @@
-import { WithUriValue } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
-import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
-import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
-import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
-import { IQuickPick, IQuickPickItem, IQuickPickItemButtonEvent } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
-interface IHandleButtonClickOptions {
-    quickPick: IQuickPick<WithUriValue<IQuickPickItem>>;
-    fileService: IFileService;
-    openerService: IOpenerService;
-    dialogService: IDialogService;
-}
-export declare function handleButtonClick(options: IHandleButtonClickOptions, context: IQuickPickItemButtonEvent<WithUriValue<IQuickPickItem>>): Promise<boolean | undefined>;
-export {};