fix: Propagate forceShellIntegration to remote terminal server (#300428)

Co-authored-by: Megan Rogge <merogge@microsoft.com>

Author: renan-r-santos

src/vs/platform/terminal/common/terminal.ts

@@ -719,6 +719,7 @@ export interface IShellLaunchConfigDto {
 	reconnectionProperties?: IReconnectionProperties;
 	type?: 'Task' | 'Local';
 	isFeatureTerminal?: boolean;
+	forceShellIntegration?: boolean;
 	tabActions?: ITerminalTabAction[];
 	shellIntegrationEnvironmentReporting?: boolean;
 	titleTemplate?: string;

src/vs/platform/terminal/test/node/terminalEnvironment.test.ts

@@ -184,6 +184,17 @@ suite('platform - terminalEnvironment', async () => {
 				});
 			});
 			suite('bash', async () => {
+				suite('forceShellIntegration', async () => {
+					test('should inject when isFeatureTerminal is true but forceShellIntegration overrides it', async () => {
+						strictEqual((await getShellIntegrationInjection({ executable: 'bash', args: [], isFeatureTerminal: true, forceShellIntegration: true }, enabledProcessOptions, defaultEnvironment, logService, productService, true)).type, 'injection');
+					});
+					test('should not inject when isFeatureTerminal is true and forceShellIntegration is false', async () => {
+						strictEqual((await getShellIntegrationInjection({ executable: 'bash', args: [], isFeatureTerminal: true, forceShellIntegration: false }, enabledProcessOptions, defaultEnvironment, logService, productService, true)).type, 'failure');
+					});
+					test('should not inject when isFeatureTerminal is true and forceShellIntegration is not set', async () => {
+						strictEqual((await getShellIntegrationInjection({ executable: 'bash', args: [], isFeatureTerminal: true }, enabledProcessOptions, defaultEnvironment, logService, productService, true)).type, 'failure');
+					});
+				});
 				suite('should override args', async () => {
 					test('when undefined, [], empty string', async () => {
 						const enabledExpectedResult = Object.freeze<IShellIntegrationConfigInjection>({

src/vs/server/node/remoteTerminalChannel.ts

@@ -204,6 +204,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 			reconnectionProperties: args.shellLaunchConfig.reconnectionProperties,
 			type: args.shellLaunchConfig.type,
 			isFeatureTerminal: args.shellLaunchConfig.isFeatureTerminal,
+			forceShellIntegration: args.shellLaunchConfig.forceShellIntegration,
 			tabActions: args.shellLaunchConfig.tabActions,
 			shellIntegrationEnvironmentReporting: args.shellLaunchConfig.shellIntegrationEnvironmentReporting,
 		};

src/vs/workbench/api/node/extHostDebugService.ts

@@ -90,7 +90,7 @@ export class ExtHostDebugService extends ExtHostDebugServiceBase {
 
 			const terminalName = args.title || nls.localize('debug.terminal.title', "Debug Process");
 
-			const shellConfig = JSON.stringify({ shell, shellArgs });
+			const shellConfig = JSON.stringify({ shell, shellArgs, cwd: args.cwd });
 			let terminal = await this._integratedTerminalInstances.checkout(shellConfig, terminalName);
 
 			let cwdForPrepareCommand: string | undefined;

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

@@ -191,6 +191,7 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 			reconnectionProperties: shellLaunchConfig.reconnectionProperties,
 			type: shellLaunchConfig.type,
 			isFeatureTerminal: shellLaunchConfig.isFeatureTerminal,
+			forceShellIntegration: shellLaunchConfig.forceShellIntegration,
 			tabActions: shellLaunchConfig.tabActions,
 			shellIntegrationEnvironmentReporting: shellLaunchConfig.shellIntegrationEnvironmentReporting,
 		};