Allow local to get backend by checking from createTerminal in terminalService.ts

Author: anthonykim1

src/vs/workbench/contrib/terminal/browser/terminalService.ts

@@ -967,9 +967,9 @@ export class TerminalService extends Disposable implements ITerminalService {
 		// Await the initialization of available profiles as long as this is not a pty terminal or a
 		// local terminal in a remote workspace as profile won't be used in those cases and these
 		// terminals need to be launched before remote connections are established.
+		const isLocalInRemoteTerminal = this._remoteAgentService.getConnection() && URI.isUri(options?.cwd) && options?.cwd.scheme === Schemas.vscodeFileResource;
 		if (this._terminalProfileService.availableProfiles.length === 0) {
 			const isPtyTerminal = options?.config && 'customPtyImplementation' in options.config;
-			const isLocalInRemoteTerminal = this._remoteAgentService.getConnection() && URI.isUri(options?.cwd) && options?.cwd.scheme === Schemas.vscodeFileResource;
 			if (!isPtyTerminal && !isLocalInRemoteTerminal) {
 				if (this._connectionState === TerminalConnectionState.Connecting) {
 					mark(`code/terminal/willGetProfiles`);
@@ -981,7 +981,19 @@ export class TerminalService extends Disposable implements ITerminalService {
 			}
 		}
 
-		const config = options?.config || this._terminalProfileService.getDefaultProfile();
+		let config = options?.config;
+		if (!config && isLocalInRemoteTerminal) {
+			const backend = await this._terminalInstanceService.getBackend(undefined);
+			const executable = await backend?.getDefaultSystemShell();
+			if (executable) {
+				config = { executable };
+			}
+		}
+
+		if (!config) {
+			config = this._terminalProfileService.getDefaultProfile();
+		}
+
 		const shellLaunchConfig = config && 'extensionIdentifier' in config ? {} : this._terminalInstanceService.convertProfileToShellLaunchConfig(config || {});
 
 		// Get the contributed profile if it was provided

src/vs/workbench/contrib/terminal/electron-browser/terminalRemote.ts

@@ -9,10 +9,8 @@ import { localize2 } from '../../../../nls.js';
 import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
 import { registerTerminalAction } from '../browser/terminalActions.js';
-import { TerminalCommandId, ITerminalProfileResolverService } from '../common/terminal.js';
-import { ITerminalLogService } from '../../../../platform/terminal/common/terminal.js';
+import { TerminalCommandId } from '../common/terminal.js';
 import { IHistoryService } from '../../../services/history/common/history.js';
-import { OS } from '../../../../base/common/platform.js';
 
 export function registerRemoteContributions() {
 	registerTerminalAction({
@@ -22,9 +20,6 @@ export function registerRemoteContributions() {
 			const historyService = accessor.get(IHistoryService);
 			const remoteAuthorityResolverService = accessor.get(IRemoteAuthorityResolverService);
 			const nativeEnvironmentService = accessor.get(INativeEnvironmentService);
-			const terminalProfileResolverService = accessor.get(ITerminalProfileResolverService);
-			const terminalLogService = accessor.get(ITerminalLogService);
-
 			let cwd: URI | undefined;
 			try {
 				const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot(Schemas.vscodeRemote);
@@ -38,23 +33,7 @@ export function registerRemoteContributions() {
 			if (!cwd) {
 				cwd = nativeEnvironmentService.userHome;
 			}
-
-			// Make sure to explicitly get the local default profile
-			const localProfile = await terminalProfileResolverService.getDefaultProfile({
-				remoteAuthority: undefined,
-				os: OS
-			});
-			terminalLogService.trace('terminalRemote#newLocal resolved profile', {
-				os: OS,
-				profileName: localProfile?.profileName,
-				isAutoDetected: localProfile?.isAutoDetected ?? false
-			});
-
-			// Create terminal with explicit local profile configuration
-			const instance = await c.service.createTerminal({
-				cwd,
-				config: localProfile
-			});
+			const instance = await c.service.createTerminal({ cwd });
 			if (!instance) {
 				return Promise.resolve(undefined);
 			}