Skip to content

Resolve regression where build task did not start in wsl #279249

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
anthonykim1 merged 14 commits into from
Nov 27, 2025
Merged

Resolve regression where build task did not start in wsl #279249

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
068323b
Debug wsl cwd regression 3
anthonykim1 Nov 24, 2025
4934f92
Merge branch 'main' into anthonykim1/wslCwdRegression3
anthonykim1 Nov 24, 2025
b62f671
skip trust check if remote or has explicit shellLaunchConfig.cwd
anthonykim1 Nov 25, 2025
acffcd9
TODO: remove logs
anthonykim1 Nov 25, 2025
95747dd
comments
anthonykim1 Nov 25, 2025
d5a5ece
More logs to show better debugging
anthonykim1 Nov 25, 2025
0f4908a
Debug getLastActiveWorkspaceRoot
anthonykim1 Nov 25, 2025
062ffb2
Remove .getLastActiveWorkspaceRoot(Schemas.file);
anthonykim1 Nov 25, 2025
6a8f6f3
Clean up all logs, remove
anthonykim1 Nov 25, 2025
6b1505e
One last debug before final cleanup
anthonykim1 Nov 25, 2025
e9ea74a
Only go into second process exit when workspace is empty
anthonykim1 Nov 25, 2025
889a9f5
Clean up the debugging logs, not needed anymore
anthonykim1 Nov 26, 2025
355a637
Only ban terminal when untristed and NOT remote
anthonykim1 Nov 26, 2025
2c40314
Try to get local from remote to create terminal in untrusted remote w…
anthonykim1 Nov 26, 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
16 changes: 7 additions & 9 deletions src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
@IProductService private readonly _productService: IProductService,
@IQuickInputService private readonly _quickInputService: IQuickInputService,
@IWorkbenchEnvironmentService workbenchEnvironmentService: IWorkbenchEnvironmentService,
@IWorkbenchEnvironmentService private readonly _workbenchEnvironmentService: IWorkbenchEnvironmentService,
@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
@IEditorService private readonly _editorService: IEditorService,
@IWorkspaceTrustRequestService private readonly _workspaceTrustRequestService: IWorkspaceTrustRequestService,
Expand Down Expand Up @@ -509,7 +509,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
// which would result in the wrong profile being selected and the wrong icon being
// permanently attached to the terminal. This also doesn't work when the default profile
// setting is set to null, that's handled after the process is created.
if (!this.shellLaunchConfig.executable && !workbenchEnvironmentService.remoteAuthority) {
if (!this.shellLaunchConfig.executable && !this._workbenchEnvironmentService.remoteAuthority) {
this._terminalProfileResolverService.resolveIcon(this._shellLaunchConfig, OS);
}
this._icon = _shellLaunchConfig.attachPersistentProcess?.icon || _shellLaunchConfig.icon;
Expand Down Expand Up @@ -1530,13 +1530,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
if (this.isDisposed) {
return;
}
const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot(Schemas.file);
if (activeWorkspaceRootUri) {
const trusted = await this._trust();
if (!trusted) {
this._onProcessExit({ message: nls.localize('workspaceNotTrustedCreateTerminal', "Cannot launch a terminal process in an untrusted workspace") });
}
} else if (this._cwd && this._userHome && this._cwd !== this._userHome) {
const trusted = await this._trust();
// Allow remote and local terminals from remote to be created in untrusted remote workspace
if (!trusted && !this.remoteAuthority && !this._workbenchEnvironmentService.remoteAuthority) {
this._onProcessExit({ message: nls.localize('workspaceNotTrustedCreateTerminal', "Cannot launch a terminal process in an untrusted workspace") });
} else if (this._workspaceContextService.getWorkspace().folders.length === 0 && this._cwd && this._userHome && this._cwd !== this._userHome) {
// something strange is going on if cwd is not userHome in an empty workspace
this._onProcessExit({
message: nls.localize('workspaceNotTrustedCreateTerminalCwd', "Cannot launch a terminal process in an untrusted workspace with cwd {0} and userHome {1}", this._cwd, this._userHome)
Expand Down
Loading