From 404102fc70f6f15e1aba226b6d56f4c75bd5fa4e Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 26 Feb 2026 18:27:34 +0100 Subject: [PATCH] revert adding active session folder to workspace (#298039) * revert adding active session folder as workspace folder * revert adding active session folder as workspace folder --- .../browser/sessionsManagementService.ts | 17 ----------------- .../browser/workspaceContextService.ts | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/vs/sessions/contrib/sessions/browser/sessionsManagementService.ts b/src/vs/sessions/contrib/sessions/browser/sessionsManagementService.ts index 1100d36cc00..b7a50d12101 100644 --- a/src/vs/sessions/contrib/sessions/browser/sessionsManagementService.ts +++ b/src/vs/sessions/contrib/sessions/browser/sessionsManagementService.ts @@ -24,8 +24,6 @@ import { AgentSessionProviders } from '../../../../workbench/contrib/chat/browse import { INewSession, LocalNewSession, RemoteNewSession } from '../../chat/browser/newSession.js'; import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js'; import { ILanguageModelsService } from '../../../../workbench/contrib/chat/common/languageModels.js'; -import { IWorkspaceEditingService } from '../../../../workbench/services/workspaces/common/workspaceEditing.js'; -import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'; export const IsNewChatSessionContext = new RawContextKey('isNewChatSession', true); @@ -120,8 +118,6 @@ export class SessionsManagementService extends Disposable implements ISessionsMa @IContextKeyService contextKeyService: IContextKeyService, @ICommandService private readonly commandService: ICommandService, @ILanguageModelsService private readonly languageModelsService: ILanguageModelsService, - @IWorkspaceEditingService private readonly workspaceEditingService: IWorkspaceEditingService, - @IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService, ) { super(); @@ -457,19 +453,6 @@ export class SessionsManagementService extends Disposable implements ISessionsMa this.logService.trace('[ActiveSessionService] Active session cleared'); } - const currentRepo = this.workspaceContextService.getWorkspace().folders[0]?.uri; - const activeSessionRepo = activeSessionItem?.providerType === AgentSessionProviders.Background ? activeSessionItem?.worktree ?? activeSessionItem?.repository : undefined; - if (activeSessionRepo) { - if (currentRepo) { - if (!this.uriIdentityService.extUri.isEqual(currentRepo, activeSessionRepo)) { - this.workspaceEditingService.updateFolders(0, 1, [{ uri: activeSessionRepo }], true); - } - } else { - this.workspaceEditingService.addFolders([{ uri: activeSessionRepo }], true); - } - } else { - this.workspaceEditingService.removeFolders([currentRepo], true); - } this._activeSession.set(activeSessionItem, undefined); } diff --git a/src/vs/sessions/services/workspace/browser/workspaceContextService.ts b/src/vs/sessions/services/workspace/browser/workspaceContextService.ts index f54aa74c065..660d475ee8b 100644 --- a/src/vs/sessions/services/workspace/browser/workspaceContextService.ts +++ b/src/vs/sessions/services/workspace/browser/workspaceContextService.ts @@ -45,7 +45,7 @@ export class SessionsWorkspaceContextService implements IWorkspaceContextService } getWorkbenchState(): WorkbenchState { - return WorkbenchState.EMPTY; + return WorkbenchState.WORKSPACE; } getWorkspaceFolder(resource: URI): IWorkspaceFolder | null {