@codingame/monaco-vscode-scm-service-override 17.2.0 → 18.0.0

package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.d.ts

@@ -1,4 +1,4 @@
-import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
 import { ISCMViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";

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

@@ -4,7 +4,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import * as scm from './media/scm.css';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { ViewPane } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ISCMViewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -17,7 +17,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
-import { getActionViewItemProvider, collectContextMenuActions } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { getActionViewItemProvider, collectContextMenuActions } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -61,7 +61,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
                     return r.provider.label;
                 },
                 getWidgetAriaLabel() {
-                    return localize(9235, "Source Control Repositories");
+                    return localize(9474, "Source Control Repositories");
                 }
             }
         });

package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.d.ts

@@ -5,7 +5,7 @@ import { CountBadge } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { ActionRunner, IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
-import { ITreeNode } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/tree";
+import { ITreeNode, ITreeRenderer } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/tree";
 import { ICompressibleTreeRenderer } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/objectTree";
 import { FuzzyScore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
 import { IListRenderer } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/list/list";
@@ -34,7 +34,7 @@ interface RepositoryTemplate {
     readonly elementDisposables: DisposableStore;
     readonly templateDisposable: IDisposable;
 }
-export declare class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMRepository, FuzzyScore, RepositoryTemplate>, IListRenderer<ISCMRepository, RepositoryTemplate> {
+export declare class RepositoryRenderer implements ICompressibleTreeRenderer<ISCMRepository, FuzzyScore, RepositoryTemplate>, IListRenderer<ISCMRepository, RepositoryTemplate>, ITreeRenderer<ISCMRepository, FuzzyScore, RepositoryTemplate> {
     private readonly toolbarMenuId;
     private readonly actionViewItemProvider;
     private commandService;
@@ -49,7 +49,7 @@ export declare class RepositoryRenderer implements ICompressibleTreeRenderer<ISC
     get templateId(): string;
     constructor(toolbarMenuId: MenuId, actionViewItemProvider: IActionViewItemProvider, commandService: ICommandService, contextKeyService: IContextKeyService, contextMenuService: IContextMenuService, hoverService: IHoverService, keybindingService: IKeybindingService, menuService: IMenuService, scmViewService: ISCMViewService, telemetryService: ITelemetryService);
     renderTemplate(container: HTMLElement): RepositoryTemplate;
-    renderElement(arg: ISCMRepository | ITreeNode<ISCMRepository, FuzzyScore>, index: number, templateData: RepositoryTemplate, height: number | undefined): void;
+    renderElement(arg: ISCMRepository | ITreeNode<ISCMRepository, FuzzyScore>, index: number, templateData: RepositoryTemplate): void;
     renderCompressedElements(): void;
     disposeElement(group: ISCMRepository | ITreeNode<ISCMRepository, FuzzyScore>, index: number, template: RepositoryTemplate): void;
     disposeTemplate(templateData: RepositoryTemplate): void;

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

@@ -10,7 +10,7 @@ import { CountBadge } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { ActionRunner } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
-import { isSCMRepository, StatusBarAction, getRepositoryResourceCount, connectPrimaryMenu } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMRepository, StatusBarAction, getRepositoryResourceCount, connectPrimaryMenu } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { defaultCountBadgeStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { WorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuItemAction, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -20,7 +20,7 @@ import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var RepositoryRenderer_1;
 registerCss(scm);
@@ -80,7 +80,7 @@ let RepositoryRenderer = class RepositoryRenderer {
         const templateDisposable = combinedDisposable(labelCustomHover, visibilityDisposable, toolBar);
         return { label, labelCustomHover, name, description, countContainer, count, toolBar, elementDisposables: ( new DisposableStore()), templateDisposable };
     }
-    renderElement(arg, index, templateData, height) {
+    renderElement(arg, index, templateData) {
         const repository = isSCMRepository(arg) ? arg : arg.element;
         templateData.name.textContent = repository.provider.name;
         if (repository.provider.rootUri) {

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.d.ts

@@ -1,7 +1,7 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane";
-import { ISCMResourceGroup, ISCMResource, ISCMRepository, ISCMInput, ISCMActionButton, ISCMActionButtonDescriptor } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
+import { ViewPane, IViewPaneOptions } from "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane";
+import { ISCMResourceGroup, ISCMResource, ISCMRepository, ISCMInput, ISCMActionButton, ISCMActionButtonDescriptor, ViewMode } from "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm";
 import { ISCMViewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
@@ -15,7 +15,7 @@ import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ITreeNode, ITreeSorter } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/tree";
-import { IResourceNode } from "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/base/common/resourceTree";
+import { IResourceNode } from "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/base/common/resourceTree";
 import { ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/objectTree";
 import { FuzzyScore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
@@ -43,7 +43,7 @@ export declare class ActionButtonRenderer implements ICompressibleTreeRenderer<I
     private actionButtons;
     constructor(commandService: ICommandService, contextMenuService: IContextMenuService, notificationService: INotificationService);
     renderTemplate(container: HTMLElement): ActionButtonTemplate;
-    renderElement(node: ITreeNode<ISCMActionButton, FuzzyScore>, index: number, templateData: ActionButtonTemplate, height: number | undefined): void;
+    renderElement(node: ITreeNode<ISCMActionButton, FuzzyScore>, index: number, templateData: ActionButtonTemplate): void;
     renderCompressedElements(): void;
     focusActionButton(actionButton: ISCMActionButton): void;
     disposeElement(node: ITreeNode<ISCMActionButton, FuzzyScore>, index: number, template: ActionButtonTemplate): void;
@@ -77,10 +77,6 @@ export declare class SCMAccessibilityProvider implements IListAccessibilityProvi
     getWidgetAriaLabel(): string;
     getAriaLabel(element: TreeElement): string;
 }
-declare enum ViewMode {
-    List = "list",
-    Tree = "tree"
-}
 declare enum ViewSortKey {
     Path = "path",
     Name = "name",
@@ -95,6 +91,7 @@ export declare const ContextKeys: {
     SCMProviderRootUri: RawContextKey<string | undefined>;
     SCMProviderHasRootUri: RawContextKey<boolean>;
     SCMHistoryItemCount: RawContextKey<number>;
+    SCMHistoryViewMode: RawContextKey<ViewMode>;
     SCMCurrentHistoryItemRefHasRemote: RawContextKey<boolean>;
     SCMCurrentHistoryItemRefInFilter: RawContextKey<boolean>;
     RepositoryCount: RawContextKey<number>;

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

@@ -5,12 +5,12 @@ import * as scm from './media/scm.css';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, dispose, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ViewAction, ViewPane } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewAction, ViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { append, $, Dimension, trackFocus, isPointerEvent, isActiveElement, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { asCSSUrl } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
-import { VIEW_PANE_ID, ISCMRepositorySortKey, InputValidationType, SCMInputChangeReason } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
+import { ViewMode, VIEW_PANE_ID, ISCMRepositorySortKey, InputValidationType, SCMInputChangeReason } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
 import { ISCMViewService, ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
-import { ResourceLabels } from '@codingame/monaco-vscode-25a9b730-95ad-54d3-8807-71421ad9b891-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-f24b7f0a-ceeb-5877-9148-81eb98a4f5d7-common/vscode/vs/workbench/browser/labels';
 import { CountBadge } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -24,12 +24,12 @@ import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { ActionRunner, Action, toAction, Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { isSCMResource, connectPrimaryMenu, isSCMResourceGroup, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { isSCMResource, connectPrimaryMenu, isSCMResourceGroup, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceNode, getActionViewItemProvider, collectContextMenuActions, isSCMViewService } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { WorkbenchCompressibleAsyncDataTree } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { disposableTimeout, ThrottledDelayer, Sequencer, Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { ResourceTree } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/base/common/resourceTree';
+import { ResourceTree } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/base/common/resourceTree';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { compareFileNames, comparePaths } from '@codingame/monaco-vscode-api/vscode/vs/base/common/comparers';
@@ -40,7 +40,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { CodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-8d39d04c-3201-5bd6-be79-eed8d17a5ad0-common/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { EditorExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { MenuPreventer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
@@ -78,7 +78,7 @@ import { defaultCountBadgeStyles, defaultButtonStyles } from '@codingame/monaco-
 import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { CodeActionController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { fillEditorsDragData } from '@codingame/monaco-vscode-25a9b730-95ad-54d3-8807-71421ad9b891-common/vscode/vs/workbench/browser/dnd';
+import { fillEditorsDragData } from '@codingame/monaco-vscode-924e8f00-6faf-5059-b518-e43427d29ab3-common/vscode/vs/workbench/browser/dnd';
 import { CodeDataTransfers } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
 import { FormatOnType } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/format/browser/formatActions';
 import { EditorOptions, EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
@@ -86,7 +86,7 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
 import { WorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
+import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { clamp, rot } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { OpenScmGroupAction } from '@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
@@ -98,8 +98,11 @@ import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
 import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
-import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
+import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, SCMInputWidget_1;
 registerCss(scm);
@@ -166,7 +169,7 @@ let ActionButtonRenderer = class ActionButtonRenderer {
         ));
         return { actionButton, disposable: Disposable.None, templateDisposable: actionButton };
     }
-    renderElement(node, index, templateData, height) {
+    renderElement(node, index, templateData) {
         templateData.disposable.dispose();
         const disposables = ( new DisposableStore());
         const actionButton = node.element;
@@ -368,7 +371,7 @@ let ResourceGroupRenderer = class ResourceGroupRenderer {
         }, 'inline'));
         template.actionBar.context = group;
     }
-    renderCompressedElements(node, index, templateData, height) {
+    renderCompressedElements(node) {
         throw ( new Error('Should never happen since node is incompressible'));
     }
     disposeElement(group, index, template) {
@@ -483,7 +486,7 @@ let ResourceRenderer = class ResourceRenderer {
     disposeElement(resource, index, template) {
         template.elementDisposables.clear();
     }
-    renderCompressedElements(node, index, template, height) {
+    renderCompressedElements(node, index, template) {
         const compressed = node.element;
         const folder = compressed.elements[compressed.elements.length - 1];
         const label = ( compressed.elements.map(e => e.name));
@@ -503,7 +506,7 @@ let ResourceRenderer = class ResourceRenderer {
         template.decorationIcon.style.backgroundImage = '';
         template.element.setAttribute('data-tooltip', '');
     }
-    disposeCompressedElements(node, index, template, height) {
+    disposeCompressedElements(node, index, template) {
         template.elementDisposables.clear();
     }
     disposeTemplate(template) {
@@ -756,7 +759,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return localize(9236, "Source Control Management");
+        return localize(9475, "Source Control Management");
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -768,17 +771,17 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         else if (isSCMInput(element)) {
             const verbosity = this.configurationService.getValue(AccessibilityVerbositySettingId.SourceControl) === true;
             if (!verbosity || !this.accessibilityService.isScreenReaderOptimized()) {
-                return localize(9237, "Source Control Input");
+                return localize(9476, "Source Control Input");
             }
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel
                 ? ( localize(
-                9238,
+                9477,
                 "Source Control Input, Use {0} to open Source Control Accessibility Help.",
                 kbLabel
             ))
                 : ( localize(
-                9239,
+                9478,
                 "Source Control Input, Run the Open Accessibility Help command for more information."
             ));
         }
@@ -808,11 +811,6 @@ SCMAccessibilityProvider = ( __decorate([
     ( __param(2, IKeybindingService)),
     ( __param(3, ILabelService))
 ], SCMAccessibilityProvider));
-var ViewMode;
-(function (ViewMode) {
-    ViewMode["List"] = "list";
-    ViewMode["Tree"] = "tree";
-})(ViewMode || (ViewMode = {}));
 var ViewSortKey;
 (function (ViewSortKey) {
     ViewSortKey["Path"] = "path";
@@ -831,6 +829,7 @@ const ContextKeys = {
     SCMProviderRootUri: ( new RawContextKey('scmProviderRootUri', undefined)),
     SCMProviderHasRootUri: ( new RawContextKey('scmProviderHasRootUri', undefined)),
     SCMHistoryItemCount: ( new RawContextKey('scmHistoryItemCount', 0)),
+    SCMHistoryViewMode: ( new RawContextKey('scmHistoryViewMode', ViewMode.List)),
     SCMCurrentHistoryItemRefHasRemote: ( new RawContextKey('scmCurrentHistoryItemRefHasRemote', false)),
     SCMCurrentHistoryItemRefInFilter: ( new RawContextKey('scmCurrentHistoryItemRefInFilter', false)),
     RepositoryCount: ( new RawContextKey('scmRepositoryCount', 0)),
@@ -840,14 +839,14 @@ const ContextKeys = {
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(9240, "View & Sort")),
+    title: ( localize(9479, "View & Sort")),
     submenu: Menus.ViewSort,
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', VIEW_PANE_ID)), ( ContextKeys.RepositoryCount.notEqualsTo(0)))),
     group: '0_view&sort',
     order: 1
 });
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
-    title: ( localize(9241, "Repositories")),
+    title: ( localize(9480, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
@@ -937,7 +936,7 @@ class SetListViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(9242, "View as List")),
+            title: ( localize(9481, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
@@ -963,7 +962,7 @@ class SetTreeViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(9243, "View as Tree")),
+            title: ( localize(9482, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
@@ -1016,17 +1015,17 @@ class RepositorySortAction extends ViewAction {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(9244, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(9483, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Name, ( localize(9245, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localize(9484, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Path, ( localize(9246, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localize(9485, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1051,17 +1050,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Name, ( localize(9247, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localize(9486, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Path, ( localize(9248, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localize(9487, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Status, ( localize(9249, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localize(9488, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1071,7 +1070,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localize(9250, "Collapse All Repositories")),
+            title: ( localize(9489, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
@@ -1090,7 +1089,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localize(9251, "Expand All Repositories")),
+            title: ( localize(9490, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
@@ -1110,11 +1109,40 @@ registerAction2(ExpandAllRepositoriesAction);
 var SCMInputWidgetCommandId;
 (function (SCMInputWidgetCommandId) {
     SCMInputWidgetCommandId["CancelAction"] = "scm.input.cancelAction";
+    SCMInputWidgetCommandId["SetupAction"] = "scm.input.triggerSetup";
 })(SCMInputWidgetCommandId || (SCMInputWidgetCommandId = {}));
 var SCMInputWidgetStorageKey;
 (function (SCMInputWidgetStorageKey) {
     SCMInputWidgetStorageKey["LastActionId"] = "scm.input.lastActionId";
 })(SCMInputWidgetStorageKey || (SCMInputWidgetStorageKey = {}));
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: SCMInputWidgetCommandId.SetupAction,
+            title: ( localize(9491, "Generate Commit Message with Copilot")),
+            icon: Codicon.sparkle,
+            f1: false,
+            menu: {
+                id: MenuId.SCMInputBox,
+                when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabled.negate()), ( ChatContextKeys.Setup.installed.negate()), ( ContextKeyExpr.equals('scmProvider', 'git'))))
+            }
+        });
+    }
+    async run(accessor, ...args) {
+        const commandService = accessor.get(ICommandService);
+        const telemetryService = accessor.get(ITelemetryService);
+        telemetryService.publicLog2('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'scmInput' });
+        const result = await commandService.executeCommand(CHAT_SETUP_ACTION_ID);
+        if (!result) {
+            return;
+        }
+        const command = product.defaultChatAgent?.generateCommitMessageCommand;
+        if (!command) {
+            return;
+        }
+        await commandService.executeCommand(command, ...args);
+    }
+});
 let SCMInputWidgetActionRunner = class SCMInputWidgetActionRunner extends ActionRunner {
     get runningActions() { return this._runningActions; }
     constructor(input, storageService) {
@@ -1145,7 +1173,10 @@ let SCMInputWidgetActionRunner = class SCMInputWidgetActionRunner extends Action
         finally {
             this._runningActions.delete(action);
             if (this._runningActions.size === 0) {
-                this.storageService.store(SCMInputWidgetStorageKey.LastActionId, action.id, StorageScope.PROFILE, StorageTarget.USER);
+                const actionId = action.id === SCMInputWidgetCommandId.SetupAction
+                    ? product.defaultChatAgent?.generateCommitMessageCommand ?? action.id
+                    : action.id;
+                this.storageService.store(SCMInputWidgetStorageKey.LastActionId, actionId, StorageScope.PROFILE, StorageTarget.USER);
             }
         }
     }
@@ -1165,10 +1196,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
         this._disposables = this._register(( new MutableDisposable()));
-        this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(9252, "More Actions...")), 'codicon-chevron-down'));
+        this._dropdownAction = ( new Action('scmInputMoreActions', ( localize(9492, "More Actions...")), 'codicon-chevron-down'));
         this._cancelAction = ( new MenuItemAction({
             id: SCMInputWidgetCommandId.CancelAction,
-            title: ( localize(9253, "Cancel")),
+            title: ( localize(9493, "Cancel")),
             icon: Codicon.stopCircle,
         }, undefined, undefined, undefined, undefined, contextKeyService, commandService));
     }
@@ -1190,7 +1221,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
             }
             this._dropdownAction.enabled = isEnabled();
             let primaryAction = undefined;
-            if (actions.length === 1) {
+            if (this.actionRunner.runningActions.size !== 0) {
+                primaryAction = this._cancelAction;
+            }
+            else if (actions.length === 1) {
                 primaryAction = actions[0];
             }
             else if (actions.length > 1) {
@@ -1379,13 +1413,13 @@ let SCMInputWidget = class SCMInputWidget {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             return kbLabel
                 ? ( localize(
-                9254,
+                9494,
                 "{0}, Use {1} to open Source Control Accessibility Help.",
                 placeholder,
                 kbLabel
             ))
                 : ( localize(
-                9255,
+                9495,
                 "{0}, Run the Open Accessibility Help command for more information.",
                 placeholder
             ));
@@ -1440,7 +1474,7 @@ let SCMInputWidget = class SCMInputWidget {
     setValidation(validation, options) {
         if (this._validationTimer) {
             clearTimeout(this._validationTimer);
-            this._validationTimer = 0;
+            this._validationTimer = undefined;
         }
         this.validation = validation;
         this.renderValidation();
@@ -1644,7 +1678,7 @@ let SCMInputWidget = class SCMInputWidget {
                 }
                 const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
                 const actionbar = ( new ActionBar(actionsContainer));
-                const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(9256, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+                const action = ( new Action('scmInputWidget.validationMessage.close', ( localize(9496, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                     this.contextViewService.hideContextView();
                     this.element.style.borderBottomLeftRadius = '2px';
                     this.element.style.borderBottomRightRadius = '2px';
@@ -2054,12 +2088,15 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         const element = e.element;
         let context = element;
         let actions = [];
+        const disposables = ( new DisposableStore());
         let actionRunner = ( new RepositoryPaneActionRunner(() => this.getSelectedResources()));
+        disposables.add(actionRunner);
         if (isSCMRepository(element)) {
             const menus = this.scmViewService.menus.getRepositoryMenus(element.provider);
             const menu = menus.repositoryContextMenu;
             context = element.provider;
             actionRunner = ( new RepositoryActionRunner(() => this.getSelectedRepositories()));
+            disposables.add(actionRunner);
             actions = collectContextMenuActions(menu);
         }
         else if (isSCMInput(element) || isSCMActionButton(element)) ;
@@ -2085,13 +2122,13 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                 actions = collectContextMenuActions(menu);
             }
         }
-        actionRunner.onWillRun(() => this.tree.domFocus());
+        disposables.add(actionRunner.onWillRun(() => this.tree.domFocus()));
         this.contextMenuService.showContextMenu({
             actionRunner,
             getAnchor: () => e.anchor,
             getActions: () => actions,
             getActionsContext: () => context,
-            onHide: () => actionRunner.dispose()
+            onHide: () => disposables.dispose()
         });
     }
     getSelectedRepositories() {

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.d.ts

@@ -8,7 +8,7 @@ import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
-import { ViewPaneContainer } from "@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
+import { ViewPaneContainer } from "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 export declare class SCMViewPaneContainer extends ViewPaneContainer {
     constructor(layoutService: IWorkbenchLayoutService, telemetryService: ITelemetryService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, themeService: IThemeService, storageService: IStorageService, configurationService: IConfigurationService, extensionService: IExtensionService, contextService: IWorkspaceContextService, viewDescriptorService: IViewDescriptorService, logService: ILogService);

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

@@ -13,7 +13,7 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-e67a0dae-5b2c-54e6-8d61-90102c78362d-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
 registerCss(scm);

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

@@ -25,9 +25,11 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { observableFromEventOpts, derivedObservableWithCache, latestChangedValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import { latestChangedValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/experimental/utils';
+import { observableFromEventOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { derivedObservableWithCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 function getProviderStorageKey(provider) {
     return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${( provider.rootUri.toString())}` : ''}`;
@@ -49,7 +51,7 @@ let RepositoryPicker = class RepositoryPicker {
         this._quickInputService = _quickInputService;
         this._scmViewService = _scmViewService;
         this._autoQuickPickItem = {
-            label: ( localize(9257, "Auto")),
+            label: ( localize(9497, "Auto")),
             description: this._autoQuickItemDescription,
             repository: 'auto'
         };

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

@@ -6,13 +6,13 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { getProviderKey } from '@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common/vscode/vs/workbench/contrib/scm/browser/util';
+import { getProviderKey } from '@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/scm/browser/util';
 import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { Parts } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 let SCMWorkingSetController = class SCMWorkingSetController extends Disposable {
     static { this.ID = 'workbench.contrib.scmWorkingSets'; }

package/vscode/src/vs/workbench/contrib/scm/common/scmService.js

@@ -15,7 +15,7 @@ import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
 
 class SCMInput extends Disposable {
     get value() {