Fix errors after 1.60.0 update

Author: jeanp413

src/vs/platform/driver/browser/baseDriver.ts

@@ -160,7 +160,7 @@ export abstract class BaseWindowDriver implements IWindowDriver {
 			throw new Error(`Xterm not found: ${selector}`);
 		}
 
-		xterm._core._coreService.triggerDataEvent(text);
+		xterm._core.coreService.triggerDataEvent(text);
 	}
 
 	getLocaleInfo(): Promise<ILocaleInfo> {

src/vs/server/node/remote-terminal.ts

@@ -12,7 +12,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import product from 'vs/platform/product/common/product';
 import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IPtyService, IShellLaunchConfig, LocalReconnectConstants } from 'vs/platform/terminal/common/terminal';
+import { IPtyService, IReconnectConstants, IShellLaunchConfig, LocalReconnectConstants, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
 import { PtyHostService } from 'vs/platform/terminal/node/ptyHostService';
 import { ICreateTerminalProcessArguments, ICreateTerminalProcessResult, REMOTE_TERMINAL_CHANNEL_NAME } from 'vs/workbench/contrib/terminal/common/remoteTerminalChannel';
 import * as platform from 'vs/base/common/platform';
@@ -34,14 +34,17 @@ import { IURITransformer, transformIncomingURIs, URITransformer } from 'vs/base/
 import { cloneAndChange } from 'vs/base/common/objects';
 
 export function registerRemoteTerminal(services: ServicesAccessor, channelServer: IPCServer<RemoteAgentConnectionContext>) {
-	const reconnectConstants = {
-		GraceTime: LocalReconnectConstants.GraceTime,
-		ShortGraceTime: LocalReconnectConstants.ShortGraceTime
-	};
 	const configurationService = services.get(IConfigurationService);
 	const logService = services.get(ILogService);
 	const telemetryService = services.get(ITelemetryService);
 	const rawURITransformerFactory = services.get(IRawURITransformerFactory);
+
+	const reconnectConstants: IReconnectConstants = {
+		graceTime: LocalReconnectConstants.GraceTime,
+		shortGraceTime: LocalReconnectConstants.ShortGraceTime,
+		scrollback: configurationService.getValue<number>(TerminalSettingId.PersistentSessionScrollback) ?? 100,
+		useExperimentalSerialization: configurationService.getValue<boolean>(TerminalSettingId.PersistentSessionExperimentalSerializer) ?? true,
+	};
 	const ptyHostService = new PtyHostService(reconnectConstants, configurationService, logService, telemetryService);
 	channelServer.registerChannel(REMOTE_TERMINAL_CHANNEL_NAME, new RemoteTerminalChannelServer(rawURITransformerFactory, logService, ptyHostService));
 }
@@ -250,6 +253,7 @@ export class RemoteTerminalChannelServer implements IServerChannel<RemoteAgentCo
 			initialCwd,
 			args.cols,
 			args.rows,
+			args.unicodeVersion,
 			env,
 			processEnv,
 			false,

src/vs/server/node/server.main.ts

@@ -315,6 +315,7 @@ export async function main(options: IServerOptions): Promise<void> {
 					workspaceStorageHome: environmentService.workspaceStorageHome,
 					userHome: environmentService.userHome,
 					os: platform.OS,
+					arch: process.arch,
 					marks: [],
 					useHostProxy: false
 				} as IRemoteAgentEnvironmentDTO, uriTranformer);