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

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

@@ -12,7 +12,7 @@ import { EditorPaneDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/wor
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { CHANGES_VIEW_CONTAINER_ID, CHANGES_VIEW_ID, SESSIONS_CHANGES_OPEN_SINGLE_FILE_DIFF_SETTING } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/changes';
-import { ChangesViewPaneContainer, SinglePaneChangesViewPane, ChangesViewPane } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/changesView';
+import { ChangesViewPaneContainer, DesktopChangesViewPane, ChangesViewPane } 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 { SessionChangesEditorInput, SessionChangesEditorSerializer } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesEditorInput';
 import { IsPhoneLayoutContext, SessionHasWorkspaceContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
@@ -29,36 +29,37 @@ import '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { SessionsChangesAccessibilityHelp } from './sessionsChangesAccessibilityHelp.js';
+import { AgentWorkbenchLayout } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench';
 import { IAgentWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench.service';
 
-let SinglePaneChangesEditorContribution = class SinglePaneChangesEditorContribution extends Disposable {
+let DesktopChangesEditorContribution = class DesktopChangesEditorContribution extends Disposable {
     static {
-        this.ID = "workbench.contrib.sessions.singlePaneChangesEditor";
+        this.ID = "workbench.contrib.sessions.desktopChangesEditor";
     }
     constructor(layoutService) {
         super();
-        if (!layoutService.isSinglePaneLayoutEnabled) {
+        if (layoutService.agentWorkbenchLayout !== AgentWorkbenchLayout.Desktop) {
             return;
         }
         this._register(( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-            EditorPaneDescriptor.create(SessionChangesEditor, SessionChangesEditor.ID, ( localize(3411, "Changes"))),
+            EditorPaneDescriptor.create(SessionChangesEditor, SessionChangesEditor.ID, ( localize(3830, "Changes"))),
             [( new SyncDescriptor(SessionChangesEditorInput))]
         ));
         this._register(( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(SessionChangesEditorInput.ID, SessionChangesEditorSerializer));
     }
 };
-SinglePaneChangesEditorContribution = ( __decorate([( __param(0, IAgentWorkbenchLayoutService))], SinglePaneChangesEditorContribution));
+DesktopChangesEditorContribution = ( __decorate([( __param(0, IAgentWorkbenchLayoutService))], DesktopChangesEditorContribution));
 registerWorkbenchContribution2(
-    SinglePaneChangesEditorContribution.ID,
-    SinglePaneChangesEditorContribution,
+    DesktopChangesEditorContribution.ID,
+    DesktopChangesEditorContribution,
     WorkbenchPhase.BlockStartup
 );
 AccessibleViewRegistry.register(( new SessionsChangesAccessibilityHelp()));
-const changesViewIcon = registerIcon("changes-view-icon", Codicon.gitCompare, ( localize2(3412, "View icon for the Changes view.")).value);
+const changesViewIcon = registerIcon("changes-view-icon", Codicon.gitCompare, ( localize2(3831, "View icon for the Changes view.")).value);
 const viewContainersRegistry = ( Registry.as(Extensions.ViewContainersRegistry));
 const changesViewContainer = viewContainersRegistry.registerViewContainer({
     id: CHANGES_VIEW_CONTAINER_ID,
-    title: ( localize2(3413, "Changes")),
+    title: ( localize2(3832, "Changes")),
     icon: changesViewIcon,
     order: 10,
     ctorDescriptor: ( new SyncDescriptor(ChangesViewPaneContainer)),
@@ -66,7 +67,7 @@ const changesViewContainer = viewContainersRegistry.registerViewContainer({
     hideIfEmpty: true,
     openCommandActionDescriptor: {
         id: CHANGES_VIEW_CONTAINER_ID,
-        mnemonicTitle: ( localize(3414, "Chan&&ges")),
+        mnemonicTitle: ( localize(3833, "Chan&&ges")),
         keybindings: {
             primary: 0,
             win: {
@@ -91,10 +92,10 @@ let ChangesViewContribution = class ChangesViewContribution extends Disposable {
     }
     constructor(layoutService) {
         super();
-        const ctor = layoutService.isSinglePaneLayoutEnabled ? SinglePaneChangesViewPane : ChangesViewPane;
+        const ctor = layoutService.agentWorkbenchLayout === AgentWorkbenchLayout.Desktop ? DesktopChangesViewPane : ChangesViewPane;
         viewsRegistry.registerViews([{
             id: CHANGES_VIEW_ID,
-            name: ( localize2(3413, "Changes")),
+            name: ( localize2(3832, "Changes")),
             containerIcon: changesViewIcon,
             ctorDescriptor: ( new SyncDescriptor(ctor)),
             canToggleVisibility: false,
@@ -119,7 +120,7 @@ registerWorkbenchContribution2(
             type: "boolean",
             tags: ["preview"],
             description: ( localize(
-                3415,
+                3834,
                 "Controls whether clicking a file in the Changes view opens a single file diff editor instead of the multi file diff editor."
             )),
             default: false

package/vscode/src/vs/sessions/contrib/changes/browser/changesActions.d.ts

@@ -2,7 +2,17 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { ISessionsService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service";
-export declare class NewSessionUncommittedChangesetOperationsActionContribution extends Disposable implements IWorkbenchContribution {
-    static readonly ID = "workbench.contrib.sessions.newSessionUncommittedChangesetOperationsAction";
-    constructor(sessionsService: ISessionsService, actionViewItemService: IActionViewItemService);
+import { IChangesViewService } from "@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/changesViewService.service";
+/**
+ * Contributes changeset operations to the Changes editor header toolbar.
+ *
+ * For a new (untitled) session this is every changeset-scoped operation of the
+ * uncommitted changes changeset (except Sync and Checkout). For an existing
+ * session only the Commit operation of the changeset selected in the Changes
+ * view is contributed here; the title bar button bar omits it so that Commit
+ * always lives in the Changes toolbar.
+ */
+export declare class ChangesHeaderChangesetOperationsActionContribution extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "workbench.contrib.sessions.changesHeaderChangesetOperationsAction";
+    constructor(sessionsService: ISessionsService, changesViewService: IChangesViewService, actionViewItemService: IActionViewItemService);
 }

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

@@ -28,7 +28,7 @@ import { DiffEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { IAgentWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/workbench.service';
 import { Menus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/browser/menus';
 import { AGENT_HOST_PULL_REQUEST_OPERATION_IDS, AGENT_HOST_COMMIT_CHANGESET_OPERATION_ID, AGENT_HOST_SYNC_CHANGESET_OPERATION_ID, AGENT_HOST_CHECKOUT_CHANGESET_OPERATION_ID } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostChangesetOperationService';
-import { SessionPrimaryPullRequestOperationContext, SessionHasOpenPullRequestContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
+import { SessionPrimaryPullRequestOperationContext, SessionHasOpenPullRequestContext, DesktopChangesEditorTransitionContext } from '@codingame/monaco-vscode-api/vscode/vs/sessions/common/contextkeys';
 import { ISessionsService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/browser/sessionsService.service';
 import { SessionChangesetOperationScope, SessionStatus, UNCOMMITTED_CHANGES_CHANGESET_ID, SessionChangesetOperationStatus } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/session';
 import { readSessionChangesStats } from '@codingame/monaco-vscode-api/vscode/vs/sessions/services/sessions/common/sessionChangesStatsCache';
@@ -38,12 +38,18 @@ import { ChangesMultiDiffSourceResolver, SessionChangesReviewedFilesContext } fr
 import '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesService';
 import { SessionChangesEditor } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesEditor';
 import { VIEW_SESSION_CHANGES_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/changes';
+import { isChangesFileResource, getChangesFileUri } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/changesViewRenderer';
 import { ISessionChangesService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/sessionChangesService.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 
 registerCss(changesActions, 1);
+function getWorkspaceResource(resource, changes) {
+    const change = changes.find(change => isChangesFileResource(change, resource));
+    return change ? getChangesFileUri(change) : resource;
+}
 class ViewAllChangesAction extends Action2 {
     static {
         this.ID = VIEW_SESSION_CHANGES_COMMAND_ID;
@@ -51,7 +57,7 @@ class ViewAllChangesAction extends Action2 {
     constructor() {
         super({
             id: ViewAllChangesAction.ID,
-            title: ( localize2(3416, "Changes")),
+            title: ( localize2(3835, "Changes")),
             icon: Codicon.diffMultiple,
             f1: false
         });
@@ -81,7 +87,7 @@ class OpenChangedFileAction extends Action2 {
     constructor() {
         super({
             id: OpenChangedFileAction.ID,
-            title: ( localize2(3417, "Open File")),
+            title: ( localize2(3836, "Open File")),
             icon: Codicon.goToFile,
             f1: false,
             menu: {
@@ -97,8 +103,9 @@ class OpenChangedFileAction extends Action2 {
         if (!(resource instanceof URI)) {
             return;
         }
+        const changesViewService = accessor.get(IChangesViewService);
         await accessor.get(IEditorService).openEditor({
-            resource
+            resource: getWorkspaceResource(resource, changesViewService.activeSessionChangesObs.get())
         });
     }
 }
@@ -128,7 +135,7 @@ class ExpandFullFileAction extends Action2 {
     constructor() {
         super({
             id: ExpandFullFileAction.ID,
-            title: ( localize2(3418, "Expand Full File")),
+            title: ( localize2(3837, "Expand Full File")),
             icon: Codicon.unfold,
             f1: false,
             menu: {
@@ -155,7 +162,7 @@ class CollapseUnchangedRegionsAction extends Action2 {
     constructor() {
         super({
             id: CollapseUnchangedRegionsAction.ID,
-            title: ( localize2(3419, "Collapse Unchanged Regions")),
+            title: ( localize2(3838, "Collapse Unchanged Regions")),
             icon: Codicon.fold,
             f1: false,
             menu: {
@@ -226,25 +233,31 @@ let ChangesetOperationsActionControllerContribution = class ChangesetOperationsA
                 return clientReviewedFilesObs.read(reader) ?? agentHostReviewedFilesObs.read(reader);
             })
         );
-        let lastPullRequestOperation;
-        this._register(
-            bindContextKey(SessionPrimaryPullRequestOperationContext, contextKeyService, reader => {
-                const operations = changesViewService.activeSessionChangesetObs.read(reader)?.operations.read(reader) ?? [];
-                const primary = operations.find(op => ( AGENT_HOST_PULL_REQUEST_OPERATION_IDS.has(op.id)))?.id ?? "";
-                if (lastPullRequestOperation !== primary) {
-                    lastPullRequestOperation = primary;
-                    logService.info(
-                        `[ChangesetOperationsActionController] Primary pull request operation: ${primary || "none"}`
-                    );
-                }
-                return primary;
-            })
-        );
-        this._register(
-            bindContextKey(SessionHasOpenPullRequestContext, contextKeyService, reader => {
-                return changesViewService.activeSessionStateObs.read(reader)?.hasOpenPullRequest === true;
-            })
+        const primaryPullRequestOperationKey = SessionPrimaryPullRequestOperationContext.bindTo(contextKeyService);
+        const hasOpenPullRequestKey = SessionHasOpenPullRequestContext.bindTo(contextKeyService);
+        const changesEditorTransitionObs = observableFromEvent(
+            contextKeyService.onDidChangeContext,
+            () => DesktopChangesEditorTransitionContext.getValue(contextKeyService) === true
         );
+        let lastPullRequestOperation;
+        this._register(autorun(reader => {
+            if (changesEditorTransitionObs.read(reader) || changesViewService.activeSessionChangesetsLoadingObs.read(reader) || changesViewService.activeSessionLoadingObs.read(reader)) {
+                return;
+            }
+            const operations = changesViewService.activeSessionChangesetObs.read(reader)?.operations.read(reader) ?? [];
+            const primary = operations.find(op => ( AGENT_HOST_PULL_REQUEST_OPERATION_IDS.has(op.id)))?.id ?? "";
+            const hasOpenPullRequest = changesViewService.activeSessionStateObs.read(reader)?.hasOpenPullRequest === true;
+            contextKeyService.bufferChangeEvents(() => {
+                primaryPullRequestOperationKey.set(primary);
+                hasOpenPullRequestKey.set(hasOpenPullRequest);
+            });
+            if (lastPullRequestOperation !== primary) {
+                lastPullRequestOperation = primary;
+                logService.info(
+                    `[ChangesetOperationsActionController] Primary pull request operation: ${primary || "none"}`
+                );
+            }
+        }));
         this._register(autorun(reader => {
             const changeset = changesViewService.activeSessionChangesetObs.read(reader);
             const resourceOperations = (changeset?.operations.read(reader) ?? []).filter(op => op.scopes.includes(SessionChangesetOperationScope.Resource));
@@ -277,7 +290,7 @@ let ChangesetOperationsActionControllerContribution = class ChangesetOperationsA
                         }
                         await changeset?.invokeOperation(operation.id, {
                             kind: "resource",
-                            resource
+                            resource: getWorkspaceResource(resource, changesViewService.activeSessionChangesObs.read(undefined))
                         });
                     }
                 }));
@@ -286,7 +299,7 @@ let ChangesetOperationsActionControllerContribution = class ChangesetOperationsA
     }
 };
 ChangesetOperationsActionControllerContribution = ( __decorate([( __param(0, IChangesViewService)), ( __param(1, IContextKeyService)), ( __param(2, ILogService))], ChangesetOperationsActionControllerContribution));
-const NEW_SESSION_CHANGESET_OPERATION_ACTION_PREFIX = "workbench.contrib.sessions.newSessionUncommittedChangesetOperation.";
+const CHANGES_HEADER_CHANGESET_OPERATION_ACTION_PREFIX = "workbench.contrib.sessions.changesHeaderChangesetOperation.";
 class CommitActionViewItem extends MenuEntryActionViewItem {
     render(container) {
         this.options.icon = false;
@@ -307,38 +320,48 @@ class CommitActionViewItem extends MenuEntryActionViewItem {
         }
     }
 }
-let NewSessionUncommittedChangesetOperationsActionContribution = class NewSessionUncommittedChangesetOperationsActionContribution extends Disposable {
+let ChangesHeaderChangesetOperationsActionContribution = class ChangesHeaderChangesetOperationsActionContribution extends Disposable {
     static {
-        this.ID = "workbench.contrib.sessions.newSessionUncommittedChangesetOperationsAction";
+        this.ID = "workbench.contrib.sessions.changesHeaderChangesetOperationsAction";
     }
-    constructor(sessionsService, actionViewItemService) {
+    constructor(sessionsService, changesViewService, actionViewItemService) {
         super();
         this._register(actionViewItemService.register(
             Menus.SessionsEditorHeaderLayout,
-            `${NEW_SESSION_CHANGESET_OPERATION_ACTION_PREFIX}${AGENT_HOST_COMMIT_CHANGESET_OPERATION_ID}`,
+            `${CHANGES_HEADER_CHANGESET_OPERATION_ACTION_PREFIX}${AGENT_HOST_COMMIT_CHANGESET_OPERATION_ID}`,
             (action, options, instantiationService) => {
                 return action instanceof MenuItemAction ? instantiationService.createInstance(CommitActionViewItem, action, options) : undefined;
             }
         ));
         this._register(autorun(reader => {
             const activeSession = sessionsService.activeSession.read(reader);
-            if (activeSession?.status.read(reader) !== SessionStatus.Untitled) {
+            if (!activeSession) {
                 return;
             }
-            const changeset = activeSession.changesets.read(reader)?.find(
-                candidate => candidate.id === UNCOMMITTED_CHANGES_CHANGESET_ID && candidate.isEnabled.read(reader)
-            );
-            const operations = changeset?.operations.read(reader).filter(operation => operation.id !== AGENT_HOST_SYNC_CHANGESET_OPERATION_ID).filter(operation => operation.id !== AGENT_HOST_CHECKOUT_CHANGESET_OPERATION_ID).filter(
-                operation => operation.scopes.includes(SessionChangesetOperationScope.Changeset)
-            ) ?? [];
-            const hasUncommittedChanges = (activeSession.workspace.read(reader)?.folders[0]?.gitRepository?.uncommittedChanges ?? 0) > 0;
+            let changeset;
+            let operations;
+            let hasUncommittedChanges = true;
+            if (activeSession.status.read(reader) === SessionStatus.Untitled) {
+                changeset = (activeSession.activeChat.read(reader) ?? activeSession.mainChat.read(reader)).changesets.read(reader)?.find(
+                    candidate => candidate.id === UNCOMMITTED_CHANGES_CHANGESET_ID && candidate.isEnabled.read(reader)
+                );
+                operations = changeset?.operations.read(reader).filter(operation => operation.id !== AGENT_HOST_SYNC_CHANGESET_OPERATION_ID).filter(operation => operation.id !== AGENT_HOST_CHECKOUT_CHANGESET_OPERATION_ID).filter(
+                    operation => operation.scopes.includes(SessionChangesetOperationScope.Changeset)
+                ) ?? [];
+                hasUncommittedChanges = (activeSession.workspace.read(reader)?.folders[0]?.gitRepository?.uncommittedChanges ?? 0) > 0;
+            } else {
+                changeset = changesViewService.activeSessionChangesetObs.read(reader);
+                operations = changeset ? changesViewService.activeSessionChangesetOperationsObs.read(reader).filter(operation => operation.id === AGENT_HOST_COMMIT_CHANGESET_OPERATION_ID).filter(
+                    operation => operation.scopes.includes(SessionChangesetOperationScope.Changeset)
+                ) : [];
+            }
             for (let index = 0; index < operations.length; index++) {
                 const operation = operations[index];
                 const precondition = operation.status === SessionChangesetOperationStatus.Disabled || operation.status === SessionChangesetOperationStatus.Running || (operation.id === AGENT_HOST_COMMIT_CHANGESET_OPERATION_ID && !hasUncommittedChanges) ? ( ContextKeyExpr.false()) : undefined;
                 reader.store.add(registerAction2(class extends Action2 {
                     constructor() {
                         super({
-                            id: `${NEW_SESSION_CHANGESET_OPERATION_ACTION_PREFIX}${operation.id}`,
+                            id: `${CHANGES_HEADER_CHANGESET_OPERATION_ACTION_PREFIX}${operation.id}`,
                             title: operation.label,
                             tooltip: operation.description,
                             icon: operation.icon,
@@ -360,7 +383,7 @@ let NewSessionUncommittedChangesetOperationsActionContribution = class NewSessio
         }));
     }
 };
-NewSessionUncommittedChangesetOperationsActionContribution = ( __decorate([( __param(0, ISessionsService)), ( __param(1, IActionViewItemService))], NewSessionUncommittedChangesetOperationsActionContribution));
+ChangesHeaderChangesetOperationsActionContribution = ( __decorate([( __param(0, ISessionsService)), ( __param(1, IChangesViewService)), ( __param(2, IActionViewItemService))], ChangesHeaderChangesetOperationsActionContribution));
 registerWorkbenchContribution2(
     ChangesMultiDiffSourceResolverContribution.ID,
     ChangesMultiDiffSourceResolverContribution,
@@ -372,8 +395,8 @@ registerWorkbenchContribution2(
     WorkbenchPhase.AfterRestored
 );
 registerWorkbenchContribution2(
-    NewSessionUncommittedChangesetOperationsActionContribution.ID,
-    NewSessionUncommittedChangesetOperationsActionContribution,
+    ChangesHeaderChangesetOperationsActionContribution.ID,
+    ChangesHeaderChangesetOperationsActionContribution,
     WorkbenchPhase.AfterRestored
 );
 registerWorkbenchContribution2(
@@ -382,4 +405,4 @@ registerWorkbenchContribution2(
     WorkbenchPhase.AfterRestored
 );
 
-export { NewSessionUncommittedChangesetOperationsActionContribution };
+export { ChangesHeaderChangesetOperationsActionContribution };

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

@@ -10,6 +10,7 @@ import { MultiDiffEditorItem } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { IMultiDiffSourceResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.service';
 import { IChangesViewService } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/common/changesViewService.service';
 import '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/sessionChangesService';
+import { getChangesEditorFileResource } from '@codingame/monaco-vscode-api/vscode/vs/sessions/contrib/changes/browser/changesEditorLabels';
 import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { derivedObservableWithCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
 import { derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -23,9 +24,6 @@ function compareChanges(a, b) {
     const bPath = isIChatSessionFileChange2(b) ? b.uri.fsPath : b.modifiedUri.fsPath;
     return comparePaths(aPath, bPath);
 }
-function getChangeResource(change) {
-    return isIChatSessionFileChange2(change) ? change.uri : change.modifiedUri;
-}
 let ChangesMultiDiffSourceResolver = class ChangesMultiDiffSourceResolver extends Disposable {
     constructor(changesViewService, multiDiffSourceResolverService, _sessionChangesService) {
         super();
@@ -41,9 +39,6 @@ let ChangesMultiDiffSourceResolver = class ChangesMultiDiffSourceResolver extend
         const changesObs = derivedObservableWithCache({
             owner: this
         }, (reader, lastValue) => {
-            if (this.changesViewService.activeSessionLoadingObs.read(reader)) {
-                return lastValue ?? [];
-            }
             const activeSessionResource = this.changesViewService.activeSessionResourceObs.read(reader);
             if (!activeSessionResource || !isEqual(activeSessionResource, sessionResource)) {
                 return lastValue ?? [];
@@ -60,7 +55,7 @@ let ChangesMultiDiffSourceResolver = class ChangesMultiDiffSourceResolver extend
         }, reader => {
             const changes = changesObs.read(reader);
             return [...changes].sort(compareChanges).map(change => {
-                const resource = getChangeResource(change);
+                const resource = getChangesEditorFileResource(change);
                 return ( new MultiDiffEditorItem(change.originalUri, change.modifiedUri, resource, undefined, {
                     [SessionChangesFileResourceContext.key]: ( resource.toString())
                 }));