Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-02 00:09:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pierceboggan/fix-@

Browse Source
This commit is contained in:
Pierce Boggan
2026-03-27 14:36:46 -06:00
committed by GitHub
parent 8dd3661e5e 0496f93688
commit 36ab523bba
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/sessions/contrib/chat/browser/aiCustomizationWorkspaceService.ts
View File

@@ -19,6 +19,7 @@ import { ILogService } from '../../../../platform/log/common/log.js';
import { IFileService } from '../../../../platform/files/common/files.js';
import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
import { localize } from '../../../../nls.js';
import { AGENT_HOST_SCHEME } from '../../../../platform/agentHost/common/agentHostUri.js';
/**
* Agent Sessions override of IAICustomizationWorkspaceService.
@@ -61,7 +62,11 @@ export class SessionsAICustomizationWorkspaceService implements IAICustomization
}
const session = this.sessionsService.activeSession.read(reader);
const repo = session?.workspace.read(reader)?.repositories[0];
return repo?.workingDirectory ?? repo?.uri;
const root = repo?.workingDirectory ?? repo?.uri;
if (root?.scheme === AGENT_HOST_SCHEME) {
return undefined;
}
return root;
});
this.hasOverrideProjectRoot = derived(reader => {
@@ -76,7 +81,11 @@ export class SessionsAICustomizationWorkspaceService implements IAICustomization
}
const session = this.sessionsService.activeSession.get();
const repo = session?.workspace.get()?.repositories[0];
return repo?.workingDirectory ?? repo?.uri;
const root = repo?.workingDirectory ?? repo?.uri;
if (root?.scheme === AGENT_HOST_SCHEME) {
return undefined;
}
return root;
}
setOverrideProjectRoot(root: URI): void {

2
src/vs/sessions/contrib/sessions/browser/views/sessionsViewActions.ts
View File

@@ -634,7 +634,7 @@ registerAction2(class AddChatAction extends Action2 {
super({
id: 'agentSession.addChat',
title: localize2('addChat', "Add Chat"),
icon: Codicon.newSession,
icon: Codicon.plus,
menu: [{
id: Menus.CommandCenter,
order: 102,