Skip to content

Use getChatSessionType for proper session type handling in multidiff content #281369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
+12 −14
Draft

Use getChatSessionType for proper session type handling in multidiff content #281369

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e559a9b
Fixes for multidiff menu actions
osortega Dec 4, 2025
c864e34
Merge branch 'main' into osortega/multidiff-menu-fixes
osortega Dec 4, 2025
75db9f0
Initial plan
Copilot Dec 4, 2025
ed2bec1
Use getChatSessionType instead of resource.scheme for proper session …
Copilot Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions src/vs/workbench/contrib/chat/browser/chatContentParts/chatMultiDiffContentPart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import { MultiDiffEditorItem } from '../../../multiDiffEditor/browser/multiDiffS
import { ChatContextKeys } from '../../common/chatContextKeys.js';
import { IEditSessionEntryDiff } from '../../common/chatEditingService.js';
import { IChatMultiDiffData, IChatMultiDiffInnerData } from '../../common/chatService.js';
import { getChatSessionType } from '../../common/chatUri.js';
import { IChatRendererContent } from '../../common/chatViewModel.js';
import { ChatTreeItem } from '../chat.js';
import { ChatEditorInput } from '../chatEditorInput.js';
import { IChatContentPart } from './chatContentParts.js';

const $ = dom.$;
Expand All @@ -57,12 +57,12 @@ export class ChatMultiDiffContentPart extends Disposable implements IChatContent

constructor(
private readonly content: IChatMultiDiffData,
_element: ChatTreeItem,
private readonly _element: ChatTreeItem,
@IInstantiationService private readonly instantiationService: IInstantiationService,
@IEditorService private readonly editorService: IEditorService,
@IThemeService private readonly themeService: IThemeService,
@IMenuService private readonly menuService: IMenuService,
@IContextKeyService private readonly contextKeyService: IContextKeyService
@IContextKeyService private readonly contextKeyService: IContextKeyService,
) {
super();

Expand Down Expand Up @@ -143,19 +143,17 @@ export class ChatMultiDiffContentPart extends Disposable implements IChatContent
}));
const setupActionBar = () => {
actionBar.clear();

const resource = this._element.sessionResource;
let marshalledUri: unknown | undefined = undefined;
let contextKeyService: IContextKeyService = this.contextKeyService;
if (this.editorService.activeEditor instanceof ChatEditorInput) {
contextKeyService = this.contextKeyService.createOverlay([
[ChatContextKeys.agentSessionType.key, this.editorService.activeEditor.getSessionType()]
]);

marshalledUri = {
...this.editorService.activeEditor.resource,
$mid: MarshalledId.Uri
};
}

contextKeyService = this.contextKeyService.createOverlay([
[ChatContextKeys.agentSessionType.key, getChatSessionType(resource)]
]);
marshalledUri = {
...resource,
$mid: MarshalledId.Uri
};

const actions = this.menuService.getMenuActions(
MenuId.ChatMultiDiffContext,
Expand Down