@codingame/monaco-vscode-scm-service-override 21.5.1 → 22.0.0

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

@@ -6,7 +6,7 @@ import { QuickDiffWorkbenchController } from './quickDiffDecorator.js';
 import { VIEWLET_ID, VIEW_PANE_ID, HISTORY_VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMService, ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { MenuRegistry, MenuId, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { SCMActiveRepositoryController, SCMActiveResourceContextKeyController } from './activity.js';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Extensions as Extensions$2, ConfigurationScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
@@ -35,7 +35,7 @@ import { SCMWorkingSetController } from './workingSet.js';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
-import { isSCMRepository } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMRepository } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
 import './quickDiffModel.js';
 import { QuickDiffEditorController } from './quickDiffWidget.js';
@@ -44,7 +44,10 @@ import { RemoteNameContext } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { SCMAccessibilityHelp } from './scmAccessibilityHelp.js';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
-import { SCMHistoryItemContextContribution } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext';
+import { SCMHistoryItemContextContribution } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 
 ModesRegistry.registerLanguage({
     id: 'scminput',
@@ -55,10 +58,10 @@ ModesRegistry.registerLanguage({
 ( Registry.as(Extensions.Workbench))
     .registerWorkbenchContribution(QuickDiffWorkbenchController, LifecyclePhase.Restored);
 registerEditorContribution(QuickDiffEditorController.ID, QuickDiffEditorController, EditorContributionInstantiation.AfterFirstRender);
-const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(9913, 'View icon of the Source Control view.')));
+const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(10003, 'View icon of the Source Control view.')));
 const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).registerViewContainer({
     id: VIEWLET_ID,
-    title: ( localize2(9914, 'Source Control')),
+    title: ( localize2(10004, 'Source Control')),
     ctorDescriptor: ( new SyncDescriptor(SCMViewPaneContainer)),
     storageId: 'workbench.scm.views.state',
     icon: sourceControlViewIcon,
@@ -67,25 +70,25 @@ const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).regist
     hideIfEmpty: true,
 }, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
 const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
-const containerTitle = ( localize(9915, "Source Control"));
+const containerTitle = ( localize(10005, "Source Control"));
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: ( localize(9916, "No source control providers registered.")),
+    content: ( localize(10006, "No source control providers registered.")),
     when: 'default'
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
     content: ( localize(
-        9917,
+        10007,
         "None of the registered source control providers work in Restricted Mode."
     )),
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: `[${( localize(9918, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
+    content: `[${( localize(10008, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scm.providerCount', 0)), WorkspaceTrustContext.IsEnabled, ( WorkspaceTrustContext.IsTrusted.toNegated())))
 });
 viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
     content: ( localize(
-        9919,
+        10009,
         "The selected source control provider does not have any source control history items."
     )),
     when: ( ContextKeys.SCMHistoryItemCount.isEqualTo(0))
@@ -93,8 +96,8 @@ viewsRegistry.registerViewWelcomeContent(HISTORY_VIEW_PANE_ID, {
 viewsRegistry.registerViews([{
         id: REPOSITORIES_VIEW_PANE_ID,
         containerTitle,
-        name: ( localize2(9920, "Repositories")),
-        singleViewPaneContainerTitle: ( localize(9921, "Source Control Repositories")),
+        name: ( localize2(10010, "Repositories")),
+        singleViewPaneContainerTitle: ( localize(10011, "Source Control Repositories")),
         ctorDescriptor: ( new SyncDescriptor(SCMRepositoriesViewPane)),
         canToggleVisibility: true,
         hideByDefault: true,
@@ -107,7 +110,7 @@ viewsRegistry.registerViews([{
 viewsRegistry.registerViews([{
         id: VIEW_PANE_ID,
         containerTitle,
-        name: ( localize2(9922, 'Changes')),
+        name: ( localize2(10012, 'Changes')),
         singleViewPaneContainerTitle: containerTitle,
         ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
         canToggleVisibility: true,
@@ -117,7 +120,7 @@ viewsRegistry.registerViews([{
         containerIcon: sourceControlViewIcon,
         openCommandActionDescriptor: {
             id: viewContainer.id,
-            mnemonicTitle: ( localize(9923, "Source &&Control")),
+            mnemonicTitle: ( localize(10013, "Source &&Control")),
             keybindings: {
                 primary: 0,
                 win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
@@ -130,8 +133,8 @@ viewsRegistry.registerViews([{
 viewsRegistry.registerViews([{
         id: HISTORY_VIEW_PANE_ID,
         containerTitle,
-        name: ( localize2(9924, "Graph")),
-        singleViewPaneContainerTitle: ( localize(9925, "Source Control Graph")),
+        name: ( localize2(10014, "Graph")),
+        singleViewPaneContainerTitle: ( localize(10015, "Source Control Graph")),
         ctorDescriptor: ( new SyncDescriptor(SCMHistoryViewPane)),
         canToggleVisibility: true,
         canMoveView: true,
@@ -149,7 +152,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
 ( Registry.as(Extensions$2.Configuration)).registerConfiguration({
     id: 'scm',
     order: 5,
-    title: ( localize(9926, "Source Control")),
+    title: ( localize(10016, "Source Control")),
     type: 'object',
     scope: ConfigurationScope.RESOURCE,
     properties: {
@@ -157,21 +160,21 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             type: 'string',
             enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
             enumDescriptions: [
-                ( localize(9927, "Show the diff decorations in all available locations.")),
-                ( localize(9928, "Show the diff decorations only in the editor gutter.")),
-                ( localize(9929, "Show the diff decorations only in the overview ruler.")),
-                ( localize(9930, "Show the diff decorations only in the minimap.")),
-                ( localize(9931, "Do not show the diff decorations."))
+                ( localize(10017, "Show the diff decorations in all available locations.")),
+                ( localize(10018, "Show the diff decorations only in the editor gutter.")),
+                ( localize(10019, "Show the diff decorations only in the overview ruler.")),
+                ( localize(10020, "Show the diff decorations only in the minimap.")),
+                ( localize(10021, "Do not show the diff decorations."))
             ],
             default: 'all',
-            description: ( localize(9932, "Controls diff decorations in the editor."))
+            description: ( localize(10022, "Controls diff decorations in the editor."))
         },
         'scm.diffDecorationsGutterWidth': {
             type: 'number',
             enum: [1, 2, 3, 4, 5],
             default: 3,
             description: ( localize(
-                9933,
+                10023,
                 "Controls the width(px) of diff decorations in gutter (added & modified)."
             ))
         },
@@ -179,11 +182,11 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             type: 'string',
             enum: ['always', 'hover'],
             enumDescriptions: [
-                ( localize(9934, "Show the diff decorator in the gutter at all times.")),
-                ( localize(9935, "Show the diff decorator in the gutter only on hover."))
+                ( localize(10024, "Show the diff decorator in the gutter at all times.")),
+                ( localize(10025, "Show the diff decorator in the gutter only on hover."))
             ],
             description: ( localize(
-                9936,
+                10026,
                 "Controls the visibility of the Source Control diff decorator in the gutter."
             )),
             default: 'always'
@@ -192,27 +195,30 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             type: 'string',
             enum: ['diff', 'none'],
             enumDescriptions: [
-                ( localize(9937, "Show the inline diff Peek view on click.")),
-                ( localize(9938, "Do nothing."))
+                ( localize(10027, "Show the inline diff Peek view on click.")),
+                ( localize(10028, "Do nothing."))
             ],
-            description: ( localize(9939, "Controls the behavior of Source Control diff gutter decorations.")),
+            description: ( localize(10029, "Controls the behavior of Source Control diff gutter decorations.")),
             default: 'diff'
         },
         'scm.diffDecorationsGutterPattern': {
             type: 'object',
             description: ( localize(
-                9940,
+                10030,
                 "Controls whether a pattern is used for the diff decorations in gutter."
             )),
             additionalProperties: false,
             properties: {
                 'added': {
                     type: 'boolean',
-                    description: ( localize(9941, "Use pattern for the diff decorations in gutter for added lines.")),
+                    description: ( localize(10031, "Use pattern for the diff decorations in gutter for added lines.")),
                 },
                 'modified': {
                     type: 'boolean',
-                    description: ( localize(9942, "Use pattern for the diff decorations in gutter for modified lines.")),
+                    description: ( localize(
+                        10032,
+                        "Use pattern for the diff decorations in gutter for modified lines."
+                    )),
                 },
             },
             default: {
@@ -224,12 +230,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             type: 'string',
             enum: ['true', 'false', 'inherit'],
             enumDescriptions: [
-                ( localize(9943, "Ignore leading and trailing whitespace.")),
-                ( localize(9944, "Do not ignore leading and trailing whitespace.")),
-                ( localize(9945, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
+                ( localize(10033, "Ignore leading and trailing whitespace.")),
+                ( localize(10034, "Do not ignore leading and trailing whitespace.")),
+                ( localize(10035, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
             ],
             description: ( localize(
-                9946,
+                10036,
                 "Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
             )),
             default: 'false'
@@ -237,7 +243,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.alwaysShowActions': {
             type: 'boolean',
             description: ( localize(
-                9947,
+                10037,
                 "Controls whether inline actions are always visible in the Source Control view."
             )),
             default: false
@@ -246,12 +252,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             type: 'string',
             enum: ['all', 'focused', 'off'],
             enumDescriptions: [
-                ( localize(9948, "Show the sum of all Source Control Provider count badges.")),
-                ( localize(9949, "Show the count badge of the focused Source Control Provider.")),
-                ( localize(9950, "Disable the Source Control count badge."))
+                ( localize(10038, "Show the sum of all Source Control Provider count badges.")),
+                ( localize(10039, "Show the count badge of the focused Source Control Provider.")),
+                ( localize(10040, "Disable the Source Control count badge."))
             ],
             description: ( localize(
-                9951,
+                10041,
                 "Controls the count badge on the Source Control icon on the Activity Bar."
             )),
             default: 'all'
@@ -260,12 +266,12 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             type: 'string',
             enum: ['hidden', 'auto', 'visible'],
             enumDescriptions: [
-                ( localize(9952, "Hide Source Control Provider count badges.")),
-                ( localize(9953, "Only show count badge for Source Control Provider when non-zero.")),
-                ( localize(9954, "Show Source Control Provider count badges."))
+                ( localize(10042, "Hide Source Control Provider count badges.")),
+                ( localize(10043, "Only show count badge for Source Control Provider when non-zero.")),
+                ( localize(10044, "Show Source Control Provider count badges."))
             ],
             markdownDescription: ( localize(
-                9955,
+                10045,
                 "Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
                 '\`#scm.alwaysShowRepositories#\`'
             )),
@@ -275,22 +281,22 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             type: 'string',
             enum: ['tree', 'list'],
             enumDescriptions: [
-                ( localize(9956, "Show the repository changes as a tree.")),
-                ( localize(9957, "Show the repository changes as a list."))
+                ( localize(10046, "Show the repository changes as a tree.")),
+                ( localize(10047, "Show the repository changes as a list."))
             ],
-            description: ( localize(9958, "Controls the default Source Control repository view mode.")),
+            description: ( localize(10048, "Controls the default Source Control repository view mode.")),
             default: 'list'
         },
         'scm.defaultViewSortKey': {
             type: 'string',
             enum: ['name', 'path', 'status'],
             enumDescriptions: [
-                ( localize(9959, "Sort the repository changes by file name.")),
-                ( localize(9960, "Sort the repository changes by path.")),
-                ( localize(9961, "Sort the repository changes by Source Control status."))
+                ( localize(10049, "Sort the repository changes by file name.")),
+                ( localize(10050, "Sort the repository changes by path.")),
+                ( localize(10051, "Sort the repository changes by Source Control status."))
             ],
             description: ( localize(
-                9962,
+                10052,
                 "Controls the default Source Control repository changes sort order when viewed as a list."
             )),
             default: 'path'
@@ -298,7 +304,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.autoReveal': {
             type: 'boolean',
             description: ( localize(
-                9963,
+                10053,
                 "Controls whether the Source Control view should automatically reveal and select files when opening them."
             )),
             default: true
@@ -306,20 +312,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.inputFontFamily': {
             type: 'string',
             markdownDescription: ( localize(
-                9964,
+                10054,
                 "Controls the font for the input message. Use `default` for the workbench user interface font family, `editor` for the `#editor.fontFamily#`'s value, or a custom font family."
             )),
             default: 'default'
         },
         'scm.inputFontSize': {
             type: 'number',
-            markdownDescription: ( localize(9965, "Controls the font size for the input message in pixels.")),
+            markdownDescription: ( localize(10055, "Controls the font size for the input message in pixels.")),
             default: 13
         },
         'scm.inputMaxLineCount': {
             type: 'number',
             markdownDescription: ( localize(
-                9966,
+                10056,
                 "Controls the maximum number of lines that the input will auto-grow to."
             )),
             minimum: 1,
@@ -329,7 +335,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.inputMinLineCount': {
             type: 'number',
             markdownDescription: ( localize(
-                9967,
+                10057,
                 "Controls the minimum number of lines that the input will auto-grow from."
             )),
             minimum: 1,
@@ -339,7 +345,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.alwaysShowRepositories': {
             type: 'boolean',
             markdownDescription: ( localize(
-                9968,
+                10058,
                 "Controls whether repositories should always be visible in the Source Control view."
             )),
             default: false
@@ -349,20 +355,20 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             enum: ['discovery time', 'name', 'path'],
             enumDescriptions: [
                 ( localize(
-                9969,
+                10059,
                 "Repositories in the Source Control Repositories view are sorted by discovery time. Repositories in the Source Control view are sorted in the order that they were selected."
             )),
                 ( localize(
-                9970,
+                10060,
                 "Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
             )),
                 ( localize(
-                9971,
+                10061,
                 "Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
             ))
             ],
             description: ( localize(
-                9972,
+                10062,
                 "Controls the sort order of the repositories in the source control repositories view."
             )),
             default: 'discovery time'
@@ -370,7 +376,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.repositories.visible': {
             type: 'number',
             description: ( localize(
-                9973,
+                10063,
                 "Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
             )),
             default: 10
@@ -378,7 +384,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.showActionButton': {
             type: 'boolean',
             markdownDescription: ( localize(
-                9974,
+                10064,
                 "Controls whether an action button can be shown in the Source Control view."
             )),
             default: true
@@ -386,7 +392,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.showInputActionButton': {
             type: 'boolean',
             markdownDescription: ( localize(
-                9975,
+                10065,
                 "Controls whether an action button can be shown in the Source Control input."
             )),
             default: true
@@ -394,7 +400,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.workingSets.enabled': {
             type: 'boolean',
             description: ( localize(
-                9976,
+                10066,
                 "Controls whether to store editor working sets when switching between source control history item groups."
             )),
             default: false
@@ -404,16 +410,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             enum: ['empty', 'current'],
             enumDescriptions: [
                 ( localize(
-                9977,
+                10067,
                 "Use an empty working set when switching to a source control history item group that does not have a working set."
             )),
                 ( localize(
-                9978,
+                10068,
                 "Use the current working set when switching to a source control history item group that does not have a working set."
             ))
             ],
             description: ( localize(
-                9979,
+                10069,
                 "Controls the default working set to use when switching to a source control history item group that does not have a working set."
             )),
             default: 'current'
@@ -421,7 +427,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.compactFolders': {
             type: 'boolean',
             description: ( localize(
-                9980,
+                10070,
                 "Controls whether the Source Control view should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element."
             )),
             default: true
@@ -429,7 +435,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.graph.pageOnScroll': {
             type: 'boolean',
             description: ( localize(
-                9981,
+                10071,
                 "Controls whether the Source Control Graph view will load the next page of items when you scroll to the end of the list."
             )),
             default: true
@@ -437,7 +443,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
         'scm.graph.pageSize': {
             type: 'number',
             description: ( localize(
-                9982,
+                10072,
                 "The number of items to show in the Source Control Graph view by default and when loading more items."
             )),
             minimum: 1,
@@ -449,16 +455,16 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
             enum: ['all', 'filter'],
             enumDescriptions: [
                 ( localize(
-                9983,
+                10073,
                 "Show badges of all history item groups in the Source Control Graph view."
             )),
                 ( localize(
-                9984,
+                10074,
                 "Show only the badges of history item groups used as a filter in the Source Control Graph view."
             ))
             ],
             description: ( localize(
-                9985,
+                10075,
                 "Controls which badges are shown in the Source Control Graph view. The badges are shown on the right side of the graph indicating the names of history item groups."
             )),
             default: 'filter'
@@ -467,7 +473,7 @@ registerWorkbenchContribution2(SCMHistoryItemContextContribution.ID, SCMHistoryI
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'scm.acceptInput',
-    metadata: { description: ( localize(9986, "Source Control: Accept Input")), args: [] },
+    metadata: { description: ( localize(10076, "Source Control: Accept Input")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     when: ( ContextKeyExpr.has('scmRepository')),
     primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -504,7 +510,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 const viewNextCommitCommand = {
-    description: { description: ( localize(9987, "Source Control: View Next Commit")), args: [] },
+    description: { description: ( localize(10077, "Source Control: View Next Commit")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -516,7 +522,7 @@ const viewNextCommitCommand = {
     }
 };
 const viewPreviousCommitCommand = {
-    description: { description: ( localize(9988, "Source Control: View Previous Commit")), args: [] },
+    description: { description: ( localize(10078, "Source Control: View Previous Commit")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -584,9 +590,9 @@ CommandsRegistry.registerCommand('scm.openInTerminal', async (accessor, provider
 CommandsRegistry.registerCommand('scm.setActiveProvider', async (accessor) => {
     const instantiationService = accessor.get(IInstantiationService);
     const scmViewService = accessor.get(ISCMViewService);
-    const placeHolder = ( localize(9989, "Select the active repository, type to filter all repositories"));
+    const placeHolder = ( localize(10079, "Select the active repository, type to filter all repositories"));
     const autoQuickItemDescription = ( localize(
-        9990,
+        10080,
         "The active repository is updated based on focused repository/active editor"
     ));
     const repositoryPicker = instantiationService.createInstance(RepositoryPicker, placeHolder, autoQuickItemDescription);
@@ -600,7 +606,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '99_terminal',
     command: {
         id: 'scm.openInTerminal',
-        title: ( localize(9991, "Open in External Terminal"))
+        title: ( localize(10081, "Open in External Terminal"))
     },
     when: ( ContextKeyExpr.and(( RemoteNameContext.isEqualTo('')), ( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
 });
@@ -608,7 +614,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '99_terminal',
     command: {
         id: 'scm.openInIntegratedTerminal',
-        title: ( localize(9992, "Open in Integrated Terminal"))
+        title: ( localize(10082, "Open in Integrated Terminal"))
     },
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('scmProviderHasRootUri', true)), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated')), ( ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both'))))))
 });
@@ -659,9 +665,35 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
-    title: ( localize(9993, "Diff Decorations")),
+    title: ( localize(10083, "Diff Decorations")),
     submenu: MenuId.SCMQuickDiffDecorations,
     when: ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.scm.diffDecorations', 'all')), ( ContextKeyExpr.equals('config.scm.diffDecorations', 'gutter')))),
     group: '9_quickDiffDecorations'
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'scm.editor.triggerSetup',
+            title: ( localize(10084, "Resolve Conflicts with AI")),
+            icon: Codicon.chatSparkle,
+            f1: false,
+            menu: {
+                id: MenuId.EditorContent,
+                when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabled.negate()), ( ChatContextKeys.Setup.installed.negate()), ( ContextKeyExpr.equals('git.activeResourceHasMergeConflicts', true))))
+            }
+        });
+    }
+    async run(accessor, ...args) {
+        const commandService = accessor.get(ICommandService);
+        const result = await commandService.executeCommand(CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID);
+        if (!result) {
+            return;
+        }
+        const command = product.defaultChatAgent?.resolveMergeConflictsCommand;
+        if (!command) {
+            return;
+        }
+        await commandService.executeCommand(command, ...args);
+    }
+});
 AccessibleViewRegistry.register(( new SCMAccessibilityHelp()));