Skip to content

remote tunnels: unify agent window access #333886

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

Merged
Connor Peet (connor4312) merged 3 commits into from
Sep 2, 2026
Merged

remote tunnels: unify agent window access #333886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37c9269
remote tunnels: unify agent window access
connor4312 Sep 1, 2026
40391b2
Merge remote-tracking branch 'origin/main' into connor4312/unify-remo…
connor4312 Sep 1, 2026
fb957a8
remote tunnels: fix agent window initialization
connor4312 Sep 1, 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
9 changes: 1 addition & 8 deletions src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,8 @@ import { DEV_CONTAINER_AGENT_HOST_CHANNEL, IDevContainerAgentHostMainService } f
import { DevContainerAgentHostMainService } from '../../../platform/agentHost/node/devContainerAgentHostService.js';
import { IWSLRemoteAgentHostMainService, WSL_REMOTE_AGENT_HOST_CHANNEL } from '../../../platform/agentHost/common/wslRemoteAgentHost.js';
import { WSLRemoteAgentHostMainService } from '../../../platform/agentHost/node/wslRemoteAgentHostService.js';
import { ITunnelAgentHostMainService, ITunnelAgentHostHostingService, TUNNEL_AGENT_HOST_CHANNEL, TUNNEL_HOST_CHANNEL } from '../../../platform/agentHost/common/tunnelAgentHost.js';
import { ITunnelAgentHostMainService, TUNNEL_AGENT_HOST_CHANNEL } from '../../../platform/agentHost/common/tunnelAgentHost.js';
import { TunnelAgentHostMainService } from '../../../platform/agentHost/node/tunnelAgentHostService.js';
import { TunnelHostMainService } from '../../../platform/agentHost/node/tunnelHostMainService.js';
import { IUserDataProfilesService } from '../../../platform/userDataProfile/common/userDataProfile.js';
import { IExtensionsProfileScannerService } from '../../../platform/extensionManagement/common/extensionsProfileScannerService.js';
import { PolicyChannelClient } from '../../../platform/policy/common/policyIpc.js';
Expand Down Expand Up @@ -434,9 +433,6 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
// Tunnel Agent Host
services.set(ITunnelAgentHostMainService, new SyncDescriptor(TunnelAgentHostMainService, undefined, true));

// Tunnel Host (hosting local agent host for remote connections)
services.set(ITunnelAgentHostHostingService, new SyncDescriptor(TunnelHostMainService, undefined, true));

return new InstantiationService(services);
}

Expand Down Expand Up @@ -529,9 +525,6 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
const tunnelAgentHostChannel = ProxyChannel.fromService(accessor.get(ITunnelAgentHostMainService), this._store);
this.server.registerChannel(TUNNEL_AGENT_HOST_CHANNEL, tunnelAgentHostChannel);

// Tunnel Host
const tunnelHostChannel = ProxyChannel.fromService(accessor.get(ITunnelAgentHostHostingService), this._store);
this.server.registerChannel(TUNNEL_HOST_CHANNEL, tunnelHostChannel);
}

private registerErrorHandler(logService: ILogService): void {
Expand Down
39 changes: 0 additions & 39 deletions src/vs/platform/agentHost/common/tunnelAgentHost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,14 +534,6 @@ export interface ITunnelAgentHostService {
getAuthProvider(options?: { silent?: boolean }): Promise<'github' | 'microsoft' | undefined>;
}

// ---- Tunnel hosting (exposing the local agent host to remote clients) --------

/** IPC channel name for the tunnel host service. */
export const TUNNEL_HOST_CHANNEL = 'tunnelHost';

/** Output channel ID for the tunnel host logs. */
export const TUNNEL_HOST_LOG_ID = 'tunnelHostService';

/** Information about an actively hosted tunnel. */
export interface ITunnelHostInfo {
readonly tunnelName: string;
Expand All @@ -560,34 +552,3 @@ export function isTunnelHosted(sharingInfo: ITunnelHostInfo | undefined, tunnel:
? sharingInfo.tunnelId === tunnel.tunnelId
: sharingInfo.tunnelName === tunnel.name;
}

/** Status of the tunnel host. */
export type TunnelHostStatus =
| { readonly active: false }
| { readonly active: true; readonly info: ITunnelHostInfo };

/**
* Shared-process service that hosts a dev tunnel using the code CLI.
*/
export const ITunnelAgentHostHostingService = createDecorator<ITunnelAgentHostHostingService>('tunnelAgentHostHostingService');

export interface ITunnelAgentHostHostingService {
readonly _serviceBrand: undefined;

/** Fires when the hosting status changes. */
readonly onDidChangeStatus: Event<TunnelHostStatus>;

/**
* Start hosting a dev tunnel that exposes the local agent host.
*
* @param token The user's access token.
* @param authProvider The auth provider that issued the token.
*/
startHosting(token: string, authProvider: 'github' | 'microsoft'): Promise<ITunnelHostInfo>;

/** Stop hosting and clean up the tunnel. */
stopHosting(): Promise<void>;

/** Get the current hosting status. */
getStatus(): Promise<TunnelHostStatus>;
}
169 changes: 0 additions & 169 deletions src/vs/platform/agentHost/node/tunnelHostMainService.ts
View file
Open in desktop

This file was deleted.

Loading