Skip to content

chat: preserve Agent Host sessions across Remote-SSH reloads #327425

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

Open
NathanielMcVicar wants to merge 2 commits into
base: main
Choose a base branch
from
+30 −2
Open

chat: preserve Agent Host sessions across Remote-SSH reloads #327425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0371702
Wrap host URI correctly
NathanielMcVicar Jul 24, 2026
12a9539
Also handle file:
NathanielMcVicar Jul 25, 2026
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
12 changes: 10 additions & 2 deletions src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionListStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
import { CancellationToken } from '../../../../../../base/common/cancellation.js';
import { Emitter, Event } from '../../../../../../base/common/event.js';
import { Disposable } from '../../../../../../base/common/lifecycle.js';
import { extUriBiasedIgnorePathCase } from '../../../../../../base/common/resources.js';
import { Schemas } from '../../../../../../base/common/network.js';
import { extUriBiasedIgnorePathCase, toLocalResource } from '../../../../../../base/common/resources.js';
import { URI } from '../../../../../../base/common/uri.js';
import { AgentSession, type IAgentSessionMetadata } from '../../../../../../platform/agentHost/common/agentService.js';
import { fromAgentHostUri } from '../../../../../../platform/agentHost/common/agentHostUri.js';
import { ActionType, type INotification, type SessionAction } from '../../../../../../platform/agentHost/common/state/sessionActions.js';
import { SessionStatus, type SessionSummary } from '../../../../../../platform/agentHost/common/state/sessionState.js';
import { IWorkspaceContextService } from '../../../../../../platform/workspace/common/workspace.js';
Expand Down Expand Up @@ -358,7 +360,13 @@ export class AgentHostSessionListStore extends Disposable {
return false;
}
const workingDirectoryUri = typeof workingDirectory === 'string' ? URI.parse(workingDirectory) : workingDirectory;
return folders.some(folder => extUriBiasedIgnorePathCase.isEqualOrParent(workingDirectoryUri, folder.uri));
const unwrappedWorkingDirectoryUri = fromAgentHostUri(workingDirectoryUri);
return folders.some(folder => {
const comparableWorkingDirectoryUri = unwrappedWorkingDirectoryUri.scheme === Schemas.file && folder.uri.scheme === Schemas.vscodeRemote
? toLocalResource(unwrappedWorkingDirectoryUri, folder.uri.authority, folder.uri.scheme)
: unwrappedWorkingDirectoryUri;
return extUriBiasedIgnorePathCase.isEqualOrParent(comparableWorkingDirectoryUri, folder.uri);
});
}

private _toRemoval(entry: IAgentHostSessionListEntry): IAgentHostSessionListRemoval {
Expand Down
20 changes: 20 additions & 0 deletions src/vs/workbench/contrib/chat/test/browser/agentSessions/agentHostChatContribution.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { createTextModel } from '../../../../../../editor/test/common/testTextMo
import { ILogService, NullLogService } from '../../../../../../platform/log/common/log.js';
import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
import { IAgentCreateSessionConfig, IAgentHostService, IAgentSessionMetadata, AgentSession } from '../../../../../../platform/agentHost/common/agentService.js';
import { toAgentHostUri } from '../../../../../../platform/agentHost/common/agentHostUri.js';
import type { ChatInputRequestWithPlanReview } from '../../../../../../platform/agentHost/common/agentHostPlanReview.js';
import { AgentFeedbackAttachmentDisplayKind, AgentFeedbackAttachmentMetadataKey } from '../../../../../../platform/agentHost/common/meta/agentFeedbackAttachments.js';
import { BrowserViewAttachmentDisplayKind, BrowserViewAttachmentMetadataKey } from '../../../../../../platform/agentHost/common/meta/browserViewAttachments.js';
Expand Down Expand Up @@ -2543,6 +2544,25 @@ suite('AgentHostChatContribution', () => {
assert.deepStrictEqual(listController.items.map(item => item.label), ['In workspace']);
});

test('refresh includes remote agent host sessions from the current workspace', async () => {
const { instantiationService, agentHostService } = createTestServices(disposables);

const workspaceFolder = URI.parse('vscode-remote://ssh-remote+host/workspace/root');
instantiationService.stub(IWorkspaceContextService, {
getWorkspace: () => ({ id: '', folders: [{ uri: workspaceFolder, name: 'root', index: 0, toResource: () => workspaceFolder }] }),
getWorkspaceFolder: () => null,
onDidChangeWorkspaceFolders: Event.None,
});

const workingDirectory = toAgentHostUri(URI.file('/workspace/root/sub'), 'remote');
agentHostService.addSession({ session: AgentSession.uri('copilot', 'remote'), startTime: 1000, modifiedTime: 2000, summary: 'Remote workspace', workingDirectory });

const listController = createSessionListController(disposables, instantiationService, agentHostService);
await listController.refresh(CancellationToken.None);

assert.deepStrictEqual(listController.items.map(item => item.label), ['Remote workspace']);
});

test('refresh does not filter when no workspace folders are open', async () => {
const { listController, agentHostService } = createContribution(disposables);

Expand Down
Loading