@codingame/monaco-vscode-workbench-service-override 37.6.0 → 38.0.0

package/vscode/src/vs/sessions/contrib/changes/browser/changesViewActions.js

@@ -3,7 +3,6 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { isDiffEditor, isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
@@ -28,7 +27,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { MultiDiffEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditor';
 import { Menus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
-import { SinglePaneDiffEditorInputActiveContext, SinglePaneLayoutEnabledContext, CustomViewVisibleContext, SessionIsCreatedContext, SessionHasChangesContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { DesktopDiffEditorInputActiveContext, DesktopLayoutContext, CustomViewVisibleContext, SessionIsCreatedContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 import { logChangesViewViewModeChange } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/sessionsTelemetry';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
 import { OPEN_PULL_REQUEST_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/github/common/types';
@@ -38,11 +37,12 @@ import { SESSIONS_EDITOR_WORD_WRAP_SETTING, SESSIONS_DIFF_EDITOR_WORD_WRAP_SETTI
 import { IDiffEditorOptionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/editor/common/diffEditorOptionsService.service';
 import { CHANGES_HEADER_ACTIONS_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/changesView';
 import { SessionChangesEditor } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesEditor';
+import { isChangesFileResource } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/changesViewRenderer';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 
 const openChangesViewActionOptions = {
     id: "workbench.action.agentSessions.openChangesView",
-    title: ( localize2(3434, "Changes")),
+    title: ( localize2(3853, "Changes")),
     icon: Codicon.diffMultiple,
     f1: false
 };
@@ -71,7 +71,7 @@ let ChangesViewActionsContribution = class ChangesViewActionsContribution extend
                 if (!activeSession) {
                     return false;
                 }
-                const changes = activeSession.changes.read(reader);
+                const changes = activeSession.activeChat.read(reader).changes.read(reader);
                 return changes.length > 0;
             })
         );
@@ -84,7 +84,7 @@ let ChangesViewActionsContribution = class ChangesViewActionsContribution extend
             () => editorService.activeEditor
         );
         this._register(bindContextKey(
-            SinglePaneDiffEditorInputActiveContext,
+            DesktopDiffEditorInputActiveContext,
             contextKeyService,
             reader => activeEditor.read(reader) instanceof DiffEditorInput
         ));
@@ -103,7 +103,7 @@ class OpenPullRequestAction extends Action2 {
     constructor() {
         super({
             id: OpenPullRequestAction.ID,
-            title: ( localize2(3435, "Open Pull Request")),
+            title: ( localize2(3854, "Open Pull Request")),
             icon: Codicon.gitPullRequest,
             f1: false,
             menu: {
@@ -126,10 +126,10 @@ class OpenPullRequestAction extends Action2 {
 }
 registerAction2(OpenPullRequestAction);
 const agentsChangesEditorActive = ( ContextKeyExpr.and(IsSessionsWindowContext, ( ActiveEditorContext.isEqualTo(SessionChangesEditor.ID))));
-const singlePaneFileDiffEditorActive = ( ContextKeyExpr.and(
+const desktopFileDiffEditorActive = ( ContextKeyExpr.and(
     IsSessionsWindowContext,
-    SinglePaneDiffEditorInputActiveContext,
-    SinglePaneLayoutEnabledContext
+    DesktopDiffEditorInputActiveContext,
+    DesktopLayoutContext
 ));
 const agentsTextDiffEditorActive = ( ContextKeyExpr.and(IsSessionsWindowContext, TextCompareEditorActiveContext));
 const agentsMultiDiffEditorActive = ( ContextKeyExpr.and(IsSessionsWindowContext, ( ActiveEditorContext.isEqualTo(MultiDiffEditor.ID))));
@@ -140,34 +140,29 @@ const agentsDiffEditorActive = ( ContextKeyExpr.or(
     agentsMultiDiffEditorActive
 ));
 const agentsMultiDiffEditorsActive = ( ContextKeyExpr.or(agentsChangesEditorActive, agentsMultiDiffEditorActive));
-const singlePaneChangesEditorActive = ( ContextKeyExpr.and(agentsChangesEditorActive, SinglePaneLayoutEnabledContext));
-const singlePaneTextDiffEditorActive = ( ContextKeyExpr.and(agentsTextDiffEditorActive, SinglePaneLayoutEnabledContext));
+const desktopChangesEditorActive = ( ContextKeyExpr.and(agentsChangesEditorActive, DesktopLayoutContext));
+const desktopTextDiffEditorActive = ( ContextKeyExpr.and(agentsTextDiffEditorActive, DesktopLayoutContext));
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: OpenMultiDiffEditorLayoutDebugAction.ID,
         title: OpenMultiDiffEditorLayoutDebugAction.TITLE,
         category: Categories.Developer
     },
-    when: singlePaneChangesEditorActive
+    when: desktopChangesEditorActive
 });
-const singlePaneChangesEditorTitle = ( ContextKeyExpr.and(singlePaneChangesEditorActive, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext));
-const singlePaneChangesEditorTitleVisible = ( ContextKeyExpr.and(singlePaneChangesEditorTitle, MainEditorAreaVisibleContext));
-const singlePaneDiffEditorTitle = ( ContextKeyExpr.and(( ContextKeyExpr.or(singlePaneChangesEditorActive, singlePaneFileDiffEditorActive)), ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext));
-const singlePaneTextDiffEditorTitle = ( ContextKeyExpr.and(singlePaneTextDiffEditorActive, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext));
-const singlePaneMultiDiffEditorTitle = ( ContextKeyExpr.and(
-    agentsMultiDiffEditorActive,
-    SinglePaneLayoutEnabledContext,
-    ( IsAuxiliaryWindowContext.toNegated()),
-    IsTopRightEditorGroupContext
-));
-const singlePaneTextEditorTitle = ( ContextKeyExpr.and(agentsTextEditorActive, SinglePaneLayoutEnabledContext, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext));
-const singlePaneDiffEditorTitleVisible = ( ContextKeyExpr.and(( ContextKeyExpr.or(
-    singlePaneChangesEditorTitle,
-    singlePaneTextDiffEditorTitle,
-    singlePaneMultiDiffEditorTitle
+const desktopChangesEditorTitle = ( ContextKeyExpr.and(desktopChangesEditorActive, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext));
+const desktopChangesEditorTitleVisible = ( ContextKeyExpr.and(desktopChangesEditorTitle, MainEditorAreaVisibleContext));
+const desktopDiffEditorTitle = ( ContextKeyExpr.and(( ContextKeyExpr.or(desktopChangesEditorActive, desktopFileDiffEditorActive)), ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext));
+const desktopTextDiffEditorTitle = ( ContextKeyExpr.and(desktopTextDiffEditorActive, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext));
+const desktopMultiDiffEditorTitle = ( ContextKeyExpr.and(agentsMultiDiffEditorActive, DesktopLayoutContext, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext));
+const desktopTextEditorTitle = ( ContextKeyExpr.and(agentsTextEditorActive, DesktopLayoutContext, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext));
+const desktopDiffEditorTitleVisible = ( ContextKeyExpr.and(( ContextKeyExpr.or(
+    desktopChangesEditorTitle,
+    desktopTextDiffEditorTitle,
+    desktopMultiDiffEditorTitle
 )), MainEditorAreaVisibleContext));
-const singlePaneMultiDiffEditorTitleVisible = ( ContextKeyExpr.and(( ContextKeyExpr.or(singlePaneChangesEditorTitle, singlePaneMultiDiffEditorTitle)), MainEditorAreaVisibleContext));
-const singlePaneTextEditorTitleVisible = ( ContextKeyExpr.and(singlePaneTextEditorTitle, MainEditorAreaVisibleContext));
+const desktopMultiDiffEditorTitleVisible = ( ContextKeyExpr.and(( ContextKeyExpr.or(desktopChangesEditorTitle, desktopMultiDiffEditorTitle)), MainEditorAreaVisibleContext));
+const desktopTextEditorTitleVisible = ( ContextKeyExpr.and(desktopTextEditorTitle, MainEditorAreaVisibleContext));
 function wordWrapToggled(settingId) {
     return ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${settingId}`, "on")), ( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${settingId}`, "inherit")), ( ContextKeyExpr.notEquals("config.editor.wordWrap", "off"))))));
 }
@@ -178,18 +173,18 @@ class ToggleSessionsEditorWordWrapAction extends Action2 {
     constructor() {
         super({
             id: ToggleSessionsEditorWordWrapAction.ID,
-            title: ( localize2(3436, "Word Wrap")),
+            title: ( localize2(3855, "Word Wrap")),
             f1: false,
             menu: [{
                 id: Menus.SessionsEditorTitle,
                 group: "1_diff",
                 order: 20,
-                when: singlePaneTextEditorTitleVisible
+                when: desktopTextEditorTitleVisible
             }, {
                 id: MenuId.EditorTitle,
                 group: "1_diff",
                 order: 20,
-                when: ( ContextKeyExpr.and(agentsTextEditorActive, ( SinglePaneLayoutEnabledContext.negate())))
+                when: ( ContextKeyExpr.and(agentsTextEditorActive, ( DesktopLayoutContext.negate())))
             }],
             toggled: wordWrapToggled(SESSIONS_EDITOR_WORD_WRAP_SETTING)
         });
@@ -205,18 +200,18 @@ class ToggleSessionsDiffEditorWordWrapAction extends Action2 {
     constructor() {
         super({
             id: ToggleSessionsDiffEditorWordWrapAction.ID,
-            title: ( localize2(3437, "Word Wrap")),
+            title: ( localize2(3856, "Word Wrap")),
             f1: false,
             menu: [{
                 id: Menus.SessionsEditorTitle,
                 group: "1_diff",
                 order: 20,
-                when: singlePaneMultiDiffEditorTitleVisible
+                when: desktopMultiDiffEditorTitleVisible
             }, {
                 id: MenuId.EditorTitle,
                 group: "1_diff",
                 order: 20,
-                when: ( ContextKeyExpr.and(agentsMultiDiffEditorsActive, ( SinglePaneLayoutEnabledContext.negate())))
+                when: ( ContextKeyExpr.and(agentsMultiDiffEditorsActive, ( DesktopLayoutContext.negate())))
             }],
             toggled: wordWrapToggled(SESSIONS_DIFF_EDITOR_WORD_WRAP_SETTING)
         });
@@ -261,13 +256,13 @@ class ChangesHeaderActionsAction extends Action2 {
     constructor() {
         super({
             id: CHANGES_HEADER_ACTIONS_ID,
-            title: ( localize2(3438, "Changes Actions")),
+            title: ( localize2(3857, "Changes Actions")),
             f1: false,
             menu: {
                 id: Menus.TitleBarSessionMenu,
                 group: "navigation",
                 order: 5,
-                when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( IsAuxiliaryWindowContext.toNegated()), ( CustomViewVisibleContext.negate()), SinglePaneLayoutEnabledContext, SessionIsCreatedContext, SessionHasChangesContext))
+                when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( IsAuxiliaryWindowContext.toNegated()), ( CustomViewVisibleContext.negate()), DesktopLayoutContext, SessionIsCreatedContext))
             }
         });
     }
@@ -281,14 +276,14 @@ class SetChangesListViewModeAction extends Action2 {
     constructor() {
         super({
             id: SetChangesListViewModeAction.ID,
-            title: ( localize2(3439, "View as List")),
+            title: ( localize2(3858, "View as List")),
             icon: Codicon.listFlat,
             f1: false,
             menu: {
                 id: Menus.SessionsEditorTitle,
                 group: "2_viewMode",
                 order: 20,
-                when: ( ContextKeyExpr.and(singlePaneDiffEditorTitle, AuxiliaryBarVisibleContext, ( ChangesContextKeys.ViewMode.isEqualTo(ChangesViewMode.Tree))))
+                when: ( ContextKeyExpr.and(desktopDiffEditorTitle, AuxiliaryBarVisibleContext, ( ChangesContextKeys.ViewMode.isEqualTo(ChangesViewMode.Tree))))
             }
         });
     }
@@ -305,14 +300,14 @@ class SetChangesTreeViewModeAction extends Action2 {
     constructor() {
         super({
             id: SetChangesTreeViewModeAction.ID,
-            title: ( localize2(3440, "View as Tree")),
+            title: ( localize2(3859, "View as Tree")),
             icon: Codicon.listTree,
             f1: false,
             menu: {
                 id: Menus.SessionsEditorTitle,
                 group: "2_viewMode",
                 order: 20,
-                when: ( ContextKeyExpr.and(singlePaneDiffEditorTitle, AuxiliaryBarVisibleContext, ( ChangesContextKeys.ViewMode.isEqualTo(ChangesViewMode.List))))
+                when: ( ContextKeyExpr.and(desktopDiffEditorTitle, AuxiliaryBarVisibleContext, ( ChangesContextKeys.ViewMode.isEqualTo(ChangesViewMode.List))))
             }
         });
     }
@@ -329,7 +324,7 @@ class CollapseAllSessionChangesDiffsAction extends Action2 {
     constructor() {
         super({
             id: CollapseAllSessionChangesDiffsAction.ID,
-            title: ( localize2(3441, "Collapse All Diffs")),
+            title: ( localize2(3860, "Collapse All Diffs")),
             icon: Codicon.collapseAll,
             f1: false,
             menu: {
@@ -337,7 +332,7 @@ class CollapseAllSessionChangesDiffsAction extends Action2 {
                 group: "secondary/1_diff",
                 order: 10,
                 when: ( ContextKeyExpr.and(
-                    singlePaneChangesEditorTitleVisible,
+                    desktopChangesEditorTitleVisible,
                     ContextKeyExpr.not("multiDiffEditorAllCollapsed")
                 ))
             }
@@ -358,14 +353,14 @@ class ExpandAllSessionChangesDiffsAction extends Action2 {
     constructor() {
         super({
             id: ExpandAllSessionChangesDiffsAction.ID,
-            title: ( localize2(3442, "Expand All Diffs")),
+            title: ( localize2(3861, "Expand All Diffs")),
             icon: Codicon.expandAll,
             f1: false,
             menu: {
                 id: Menus.SessionsEditorHeaderLayout,
                 group: "secondary/1_diff",
                 order: 10,
-                when: ( ContextKeyExpr.and(singlePaneChangesEditorActive, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext, MainEditorAreaVisibleContext, ( ContextKeyExpr.has("multiDiffEditorAllCollapsed"))))
+                when: ( ContextKeyExpr.and(desktopChangesEditorActive, ( IsAuxiliaryWindowContext.toNegated()), IsTopRightEditorGroupContext, MainEditorAreaVisibleContext, ( ContextKeyExpr.has("multiDiffEditorAllCollapsed"))))
             }
         });
     }
@@ -379,22 +374,22 @@ class ExpandAllSessionChangesDiffsAction extends Action2 {
 registerAction2(ExpandAllSessionChangesDiffsAction);
 MenuRegistry.appendMenuItem(Menus.SessionsEditorHeaderLayout, {
     submenu: Menus.SessionsDiffEditorView,
-    title: ( localize(3443, "Diff View")),
+    title: ( localize(3862, "Diff View")),
     group: "secondary/1_diff",
     order: 20,
-    when: singlePaneDiffEditorTitleVisible
+    when: desktopDiffEditorTitleVisible
 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     submenu: Menus.SessionsDiffEditorView,
-    title: ( localize(3443, "Diff View")),
+    title: ( localize(3862, "Diff View")),
     group: "1_diff",
     order: 10,
-    when: ( ContextKeyExpr.and(agentsDiffEditorActive, ( SinglePaneLayoutEnabledContext.negate())))
+    when: ( ContextKeyExpr.and(agentsDiffEditorActive, ( DesktopLayoutContext.negate())))
 });
 MenuRegistry.appendMenuItem(Menus.SessionsDiffEditorView, {
     command: {
         id: SET_DIFF_VIEW_MODE_INLINE,
-        title: ( localize(3444, "Inline")),
+        title: ( localize(3863, "Inline")),
         toggled: ( SessionsDiffViewModeContext.isEqualTo("inline"))
     },
     group: "1_view",
@@ -403,13 +398,13 @@ MenuRegistry.appendMenuItem(Menus.SessionsDiffEditorView, {
 MenuRegistry.appendMenuItem(Menus.SessionsDiffEditorView, {
     command: {
         id: SET_DIFF_VIEW_MODE_SIDE_BY_SIDE,
-        title: ( localize(3445, "Side by Side")),
+        title: ( localize(3864, "Side by Side")),
         toggled: ( SessionsDiffViewModeContext.isEqualTo("sideBySide"))
     },
     group: "1_view",
     order: 2
 });
-for (const [title, when] of [[( localize(3446, "Automatic (Currently Side by Side)")), EditorContextKeys.diffEditorAutomaticRenderSideBySide], [( localize(3447, "Automatic (Currently Inline)")), ( EditorContextKeys.diffEditorAutomaticRenderSideBySide.toNegated())]]) {
+for (const [title, when] of [[( localize(3865, "Automatic (Currently Side by Side)")), EditorContextKeys.diffEditorAutomaticRenderSideBySide], [( localize(3866, "Automatic (Currently Inline)")), ( EditorContextKeys.diffEditorAutomaticRenderSideBySide.toNegated())]]) {
     MenuRegistry.appendMenuItem(Menus.SessionsDiffEditorView, {
         command: {
             id: SET_DIFF_VIEW_MODE_AUTOMATIC,
@@ -424,7 +419,7 @@ for (const [title, when] of [[( localize(3446, "Automatic (Currently Side by Sid
 MenuRegistry.appendMenuItem(Menus.SessionsDiffEditorView, {
     command: {
         id: DIFF_VIEW_MODE_INLINE_TEMPORARY,
-        title: ( localize(3448, "Inline (Temporary)")),
+        title: ( localize(3867, "Inline (Temporary)")),
         toggled: EditorContextKeys.diffEditorTemporaryInlineMode,
         precondition: ( ContextKeyExpr.false())
     },
@@ -435,8 +430,8 @@ MenuRegistry.appendMenuItem(Menus.SessionsDiffEditorView, {
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TOGGLE_DIFF_SIDE_BY_SIDE,
-        title: ( localize2(3449, "Toggle Preferred Diff View")),
-        category: ( localize2(3450, "Changes"))
+        title: ( localize2(3868, "Toggle Preferred Diff View")),
+        category: ( localize2(3869, "Changes"))
     },
     when: agentsDiffEditorActive
 });
@@ -447,7 +442,7 @@ class OpenChangesAction extends Action2 {
     constructor() {
         super({
             id: OpenChangesAction.ID,
-            title: ( localize2(3451, "Open Changes")),
+            title: ( localize2(3870, "Open Changes")),
             icon: Codicon.gitCompare,
             f1: false
         });
@@ -456,7 +451,7 @@ class OpenChangesAction extends Action2 {
         const editorService = accessor.get(IEditorService);
         const changesViewService = accessor.get(IChangesViewService);
         const sessionChanges = changesViewService.activeSessionChangesObs.get();
-        const changes = sessionChanges?.filter(change => ( resources.some(resource => isEqual(change.modifiedUri ?? change.originalUri, resource)))) ?? [];
+        const changes = sessionChanges?.filter(change => ( resources.some(resource => isChangesFileResource(change, resource)))) ?? [];
         await Promise.all(changes.map(change => editorService.openEditor({
             original: {
                 resource: change.originalUri
@@ -476,7 +471,7 @@ class OpenFileAction extends Action2 {
     constructor() {
         super({
             id: OpenFileAction.ID,
-            title: ( localize2(3452, "Open File")),
+            title: ( localize2(3871, "Open File")),
             icon: Codicon.goToFile,
             f1: false,
             menu: [
@@ -492,7 +487,7 @@ class OpenFileAction extends Action2 {
                 order: 1,
                 alt: {
                     id: OpenChangesAction.ID,
-                    title: ( localize2(3451, "Open Changes")),
+                    title: ( localize2(3870, "Open Changes")),
                     icon: Codicon.gitCompare
                 },
                 when: ( ContextKeyExpr.and(IsSessionsWindowContext, ( ChangesContextKeys.ChangeKind.isEqualTo("file")), ( openSingleFileDiffEnabled.negate())))

package/vscode/src/vs/sessions/contrib/changes/browser/changesetReviewActions.js

@@ -5,7 +5,7 @@ import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/v
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IChangesViewService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/changesViewService.service';
-import { getChangesEditorFileStats } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/changesEditorLabels';
+import { findChangesEditorFileChange, getChangesEditorFileResource } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/changesEditorLabels';
 import { SessionChangesFileResourceContext } from './changesMultiDiffSourceResolver.js';
 import { ChangesetReviewSupportContext, ChangesetReviewedFilesContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/changesViewService';
 import { CHANGESET_REVIEW_ACTION_ID, SessionChangesEditor } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesEditor';
@@ -14,7 +14,7 @@ class ChangesetReviewAction extends Action2 {
     constructor() {
         super({
             id: CHANGESET_REVIEW_ACTION_ID,
-            title: ( localize(3453, "Viewed")),
+            title: ( localize(3872, "Viewed")),
             f1: false,
             toggled: {
                 condition: ContextKeyExpr.in(SessionChangesFileResourceContext.key, ChangesetReviewedFilesContext.key)
@@ -36,13 +36,13 @@ class ChangesetReviewAction extends Action2 {
         if (changesViewService.activeSessionChangesetObs.get()?.capabilities?.review !== true) {
             return;
         }
-        const activeSessionChanges = changesViewService.activeSessionChangesObs.get();
-        if (!getChangesEditorFileStats(resource, activeSessionChanges)) {
+        const change = findChangesEditorFileChange(resource, changesViewService.activeSessionChangesObs.get());
+        if (!change) {
             return;
         }
         const activeEditorPane = accessor.get(IEditorService).activeEditorPane;
-        const reviewedFiles = activeSessionChanges.filter(change => change.reviewed).map(change => change.modifiedUri?.toString() ?? change.originalUri?.toString()).filter(uri => uri !== undefined);
-        const review = !reviewedFiles.includes(( resource.toString()));
+        const fileResource = getChangesEditorFileResource(change);
+        const review = !change.reviewed;
         if (activeEditorPane instanceof SessionChangesEditor) {
             if (review) {
                 activeEditorPane.collapse(resource);
@@ -50,7 +50,7 @@ class ChangesetReviewAction extends Action2 {
                 activeEditorPane.expand(resource);
             }
         }
-        changesViewService.setChangesetFilesReviewState([resource], review);
+        changesViewService.setChangesetFilesReviewState([fileResource], review);
     }
 }
 registerAction2(ChangesetReviewAction);

package/vscode/src/vs/sessions/contrib/changes/browser/media/changesActions.css

@@ -9,3 +9,9 @@
 	font-size: var(--vscode-fontSize-label1);
 	line-height: 16px;
 }
+
+/* The codicon is a child of the label, so the global `.monaco-workbench .codicon`
+ * icon color wins over the disabled color the action bar applies to the label. */
+.monaco-action-bar .action-item.changes-commit-action.disabled .action-label > .codicon {
+	color: var(--vscode-disabledForeground);
+}

package/vscode/src/vs/sessions/contrib/changes/browser/sessionSyncChanges.js

@@ -15,17 +15,17 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { Menus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
+import { Menus, getNewSessionRepositoryConfigGroup } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
 import { SessionIdContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 import { ISessionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionContext.service';
 import { ISessionsPartService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsPartService.service';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
-import { UNCOMMITTED_CHANGES_CHANGESET_ID, SessionChangesetOperationScope, SessionChangesetOperationStatus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
+import { UNCOMMITTED_CHANGES_CHANGESET_ID, SessionChangesetOperationScope, SessionChangesetOperationStatus, getSessionWorkspaceKind, SessionWorkspaceKind } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
 import { 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';
 
 function getSyncChangesOperation(session, reader) {
-    const changeset = session?.changesets.read(reader)?.find(
+    const changeset = session?.activeChat.read(reader).changesets.read(reader)?.find(
         candidate => candidate.id === UNCOMMITTED_CHANGES_CHANGESET_ID && candidate.isEnabled.read(reader)
     );
     const operation = changeset?.operations.read(reader).find(
@@ -39,22 +39,26 @@ function getSyncChangesOperation(session, reader) {
 function isSyncChangesEnabled(operation) {
     return !!operation && operation.status !== SessionChangesetOperationStatus.Disabled && operation.status !== SessionChangesetOperationStatus.Running;
 }
-function hasSyncChangesCounts(session, reader) {
-    const repository = session?.workspace.read(reader)?.folders[0]?.gitRepository;
-    return (repository?.incomingChanges ?? 0) > 0 || (repository?.outgoingChanges ?? 0) > 0;
+function isFolderSession(session, reader) {
+    const workspace = session?.activeChat.read(reader).workspace.read(reader);
+    return getSessionWorkspaceKind(workspace, session?.worktreePending?.read(reader)) === SessionWorkspaceKind.Folder;
+}
+function shouldShowSyncChanges(session, reader) {
+    const repository = session?.activeChat.read(reader).workspace.read(reader)?.folders[0]?.gitRepository;
+    return isFolderSession(session, reader) && ((repository?.incomingChanges ?? 0) > 0 || (repository?.outgoingChanges ?? 0) > 0);
 }
 function getSyncChangesTooltip(incomingChanges, outgoingChanges, upstreamBranchName) {
     if (!upstreamBranchName || (incomingChanges === 0 && outgoingChanges === 0)) {
-        return localize(3545, "Synchronize Changes");
+        return localize(3967, "Synchronize Changes");
     }
     if (outgoingChanges === 0) {
-        return localize(3546, "Pull {0} commits from {1}", incomingChanges, upstreamBranchName);
+        return localize(3968, "Pull {0} commits from {1}", incomingChanges, upstreamBranchName);
     }
     if (incomingChanges === 0) {
-        return localize(3547, "Push {0} commits to {1}", outgoingChanges, upstreamBranchName);
+        return localize(3969, "Push {0} commits to {1}", outgoingChanges, upstreamBranchName);
     }
     return localize(
-        3548,
+        3970,
         "Pull {0} and push {1} commits between {2}",
         incomingChanges,
         outgoingChanges,
@@ -68,7 +72,7 @@ class SessionSyncChangesAction extends Action2 {
     constructor() {
         super({
             id: SessionSyncChangesAction.ID,
-            title: ( localize2(3549, "Sync Changes")),
+            title: ( localize2(3971, "Sync Changes")),
             icon: Codicon.sync,
             f1: false
         });
@@ -76,8 +80,8 @@ class SessionSyncChangesAction extends Action2 {
     async run(accessor, context) {
         const session = context ? context.session : accessor.get(ISessionsService).activeSession.get();
         const sync = getSyncChangesOperation(session);
-        if (!sync || !isSyncChangesEnabled(sync.operation)) {
-            throw ( new Error(( localize(3550, "Sync Changes is no longer available for this session."))));
+        if (!sync || !isFolderSession(session) || !isSyncChangesEnabled(sync.operation)) {
+            throw ( new Error(( localize(3972, "Sync Changes is no longer available for this session."))));
         }
         await sync.changeset.invokeOperation(sync.operation.id);
     }
@@ -97,16 +101,16 @@ let SessionSyncChangesActionViewItem = class SessionSyncChangesActionViewItem ex
         this._register(autorun(reader => {
             const session = sessionContext.session.read(reader);
             const operation = getSyncChangesOperation(session, reader)?.operation;
-            const repository = session?.workspace.read(reader)?.folders[0]?.gitRepository;
+            const repository = session?.activeChat.read(reader).workspace.read(reader)?.folders[0]?.gitRepository;
             const incomingChanges = repository?.incomingChanges ?? 0;
             const outgoingChanges = repository?.outgoingChanges ?? 0;
             if (incomingChanges === 0 && outgoingChanges === 0) {
                 return;
             }
-            this._countsLabel = incomingChanges > 0 ? outgoingChanges > 0 ? ( localize(3551, "{0}↓ {1}↑", incomingChanges, outgoingChanges)) : ( localize(3552, "{0}↓", incomingChanges)) : ( localize(3553, "{0}↑", outgoingChanges));
+            this._countsLabel = incomingChanges > 0 ? outgoingChanges > 0 ? ( localize(3973, "{0}↓ {1}↑", incomingChanges, outgoingChanges)) : ( localize(3974, "{0}↓", incomingChanges)) : ( localize(3975, "{0}↑", outgoingChanges));
             this._running = operation?.status === SessionChangesetOperationStatus.Running;
             this._icon = this._running ? ThemeIcon.modify(Codicon.sync, "spin") : operation?.icon ?? Codicon.sync;
-            this._tooltip = this._running ? ( localize(3554, "Synchronizing Changes...")) : getSyncChangesTooltip(incomingChanges, outgoingChanges, repository?.upstreamBranchName);
+            this._tooltip = this._running ? ( localize(3976, "Synchronizing Changes...")) : getSyncChangesTooltip(incomingChanges, outgoingChanges, repository?.upstreamBranchName);
             this.updateLabel();
             this.updateTooltip();
         }));
@@ -130,7 +134,7 @@ let SessionSyncChangesActionViewItem = class SessionSyncChangesActionViewItem ex
     }
     dispose() {
         const session = this.sessionContext.session.get();
-        if ((!getSyncChangesOperation(session) || !hasSyncChangesCounts(session)) && this.element?.contains(getActiveElement())) {
+        if ((!getSyncChangesOperation(session) || !shouldShowSyncChanges(session)) && this.element?.contains(getActiveElement())) {
             this.sessionsPartService.focusSession(this.sessionContext.session.get());
         }
         super.dispose();
@@ -156,7 +160,7 @@ let SessionSyncChangesContribution = class SessionSyncChangesContribution extend
                 }
                 const syncEnabled = derived(reader => {
                     const sync = getSyncChangesOperation(session, reader);
-                    return sync && hasSyncChangesCounts(session, reader) ? isSyncChangesEnabled(sync.operation) : undefined;
+                    return sync && shouldShowSyncChanges(session, reader) ? isSyncChangesEnabled(sync.operation) : undefined;
                 });
                 reader.store.add(autorun(reader => {
                     const enabled = syncEnabled.read(reader);
@@ -164,12 +168,12 @@ let SessionSyncChangesContribution = class SessionSyncChangesContribution extend
                         reader.store.add(MenuRegistry.appendMenuItem(Menus.NewSessionRepositoryConfig, {
                             command: {
                                 id: SessionSyncChangesAction.ID,
-                                title: ( localize(3549, "Sync Changes")),
+                                title: ( localize(3971, "Sync Changes")),
                                 icon: Codicon.sync,
                                 precondition: enabled ? undefined : ( ContextKeyExpr.false())
                             },
-                            group: "navigation",
-                            order: 4,
+                            group: getNewSessionRepositoryConfigGroup(Number.MAX_SAFE_INTEGER, SessionSyncChangesAction.ID),
+                            order: Number.MAX_SAFE_INTEGER,
                             when: ( ContextKeyExpr.and(IsSessionsWindowContext, ChatContextKeys.enabled, ( SessionIdContext.isEqualTo(session.sessionId))))
                         }));
                     }