Change:
Moved in I know there's nothing enforcing this, but the terminal folder should rarely be depended upon outside of debug/tasks. Having in platform/terminal means that platform/request depends on the terminal which creates a weird relationship: platform/request -platform/terminal contrib/terminal -platform/request Terminal only exists in platform so that it can be used in the pty host, I'd prefer to keep it similar to a workbench contrib where nothing else in platform depends on it. If no other folder makes sense I propose creating a as it's a similar theme to what's going on in The original seemed fine but I don't understand the tangle.

Discussion:
import { NativeParsedArgs } from 'vs/platform/environment/common/argv'; import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService'; import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper'; <del> import { getResolvedShellEnv } from 'vs/platform/terminal/node/shellEnv'; </del> <ins> import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv'; </ins> import { IExtensionUrlTrustService } from 'vs/platform/extensionManagement/common/extensionUrlTrust'; import { ExtensionUrlTrustService } from 'vs/platform/extensionManagement/node/extensionUrlTrustService'; import { IExtensionHostStarter, ipcExtensionHostStarterChannelName } from 'vs/platform/extensions/common/extensionHostStarter';

import { IRequestContext, IRequestOptions } from 'vs/base/parts/request/common/request'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { INativeEnvironmentService } from 'vs/platform/environment/common/environment'; <del> import { getResolvedShellEnv } from 'vs/platform/terminal/node/shellEnv'; </del> <ins> import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv'; </ins> import { ILogService } from 'vs/platform/log/common/log'; import { IHTTPConfiguration, IRequestService } from 'vs/platform/request/common/request'; import { Agent, getProxyAgent } from 'vs/platform/request/node/proxy';

<ins> /*--------------------------------------------------------------------------------------------- *  Copyright (c) Microsoft Corporation. All rights reserved. *  Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ import { spawn } from 'child_process'; import { basename } from 'vs/base/common/path'; import { localize } from 'vs/nls'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import { canceled, isCancellationError } from 'vs/base/common/errors'; import { IProcessEnvironment, isWindows, OS } from 'vs/base/common/platform'; import { generateUuid } from 'vs/base/common/uuid'; import { getSystemShell } from 'vs/base/node/shell'; import { NativeParsedArgs } from 'vs/platform/environment/common/argv'; import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper'; import { ILogService } from 'vs/platform/log/common/log'; import { Promises } from 'vs/base/common/async'; /** * The maximum of time we accept to wait on resolving the shell * environment before giving up. This ensures we are not blocking * other tasks from running for a too long time period. */ const MAX_SHELL_RESOLVE_TIME = 10000; let unixShellEnvPromise: Promise<typeof process.env> | undefined = undefined; /** * Resolves the shell environment by spawning a shell. This call will cache * the shell spawning so that subsequent invocations use that cached result. * * Will throw an error if: * - we hit a timeout of `MAX_SHELL_RESOLVE_TIME` * - any other error from spawning a shell to figure out the environment */ export async function getResolvedShellEnv(logService: ILogService, args: NativeParsedArgs, env: IProcessEnvironment): Promise<typeof process.env> { // Skip if --force-disable-user-env if (args['force-disable-user-env']) { logService.trace('resolveShellEnv(): skipped (--force-disable-user-env)'); return {}; } // Skip on windows else if (isWindows) { logService.trace('resolveShellEnv(): skipped (Windows)'); return {}; } // Skip if running from CLI already else if (isLaunchedFromCli(env) && !args['force-user-env']) { logService.trace('resolveShellEnv(): skipped (VSCODE_CLI is set)'); return {}; } // Otherwise resolve (macOS, Linux) else { if (isLaunchedFromCli(env)) { logService.trace('resolveShellEnv(): running (--force-user-env)'); } else { logService.trace('resolveShellEnv(): running (macOS/Linux)'); } // Call this only once and cache the promise for // subsequent calls since this operation can be // expensive (spawns a process). if (!unixShellEnvPromise) { unixShellEnvPromise = Promises.withAsyncBody<NodeJS.ProcessEnv>(async (resolve, reject) => { const cts = new CancellationTokenSource(); // Give up resolving shell env after some time const timeout = setTimeout(() => { cts.dispose(true); reject(new Error(localize('resolveShellEnvTimeout', "Unable to resolve your shell environment in a reasonable time. Please review your shell configuration."))); }, MAX_SHELL_RESOLVE_TIME); // Resolve shell env and handle errors try { resolve(await doResolveUnixShellEnv(logService, cts.token)); } catch (error) { if (!isCancellationError(error) && !cts.token.isCancellationRequested) { reject(new Error(localize('resolveShellEnvError', "Unable to resolve your shell environment: {0}", toErrorMessage(error)))); } else { resolve({}); } } finally { clearTimeout(timeout); cts.dispose(); } }); } return unixShellEnvPromise; } } async function doResolveUnixShellEnv(logService: ILogService, token: CancellationToken): Promise<typeof process.env> { const runAsNode = process.env['ELECTRON_RUN_AS_NODE']; logService.trace('getUnixShellEnvironment#runAsNode', runAsNode); const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE']; logService.trace('getUnixShellEnvironment#noAttach', noAttach); const mark = generateUuid().replace(/-/g, '').substr(0, 12); const regex = new RegExp(mark + '(.*)' + mark); const env = { ...process.env, ELECTRON_RUN_AS_NODE: '1', ELECTRON_NO_ATTACH_CONSOLE: '1' }; logService.trace('getUnixShellEnvironment#env', env); const systemShellUnix = await getSystemShell(OS, env); logService.trace('getUnixShellEnvironment#shell', systemShellUnix); return new Promise<typeof process.env>((resolve, reject) => { if (token.isCancellationRequested) { return reject(canceled()); } // handle popular non-POSIX shells const name = basename(systemShellUnix); let command: string, shellArgs: Array<string>; const extraArgs = (process.versions['electron'] && process.versions['microsoft-build']) ? '--ms-enable-electron-run-as-node' : ''; if (/^pwsh(-preview)?$/.test(name)) { // Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how // you escape single quotes inside of a single quoted string. command = `& '${process.execPath}' ${extraArgs} -p '''${mark}'' + JSON.stringify(process.env) + ''${mark}'''`; shellArgs = ['-Login', '-Command']; } else { command = `'${process.execPath}' ${extraArgs} -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`; if (name === 'tcsh') { shellArgs = ['-ic']; } else { shellArgs = ['-ilc']; } } logService.trace('getUnixShellEnvironment#spawn', JSON.stringify(shellArgs), command); const child = spawn(systemShellUnix, [...shellArgs, command], { detached: true, stdio: ['ignore', 'pipe', 'pipe'], env }); token.onCancellationRequested(() => { child.kill(); return reject(canceled()); }); child.on('error', err => { logService.error('getUnixShellEnvironment#errorChildProcess', toErrorMessage(err)); reject(err); }); const buffers: Buffer[] = []; child.stdout.on('data', b => buffers.push(b)); const stderr: Buffer[] = []; child.stderr.on('data', b => stderr.push(b)); child.on('close', (code, signal) => { const raw = Buffer.concat(buffers).toString('utf8'); logService.trace('getUnixShellEnvironment#raw', raw); const stderrStr = Buffer.concat(stderr).toString('utf8'); if (stderrStr.trim()) { logService.trace('getUnixShellEnvironment#stderr', stderrStr); } if (code || signal) { return reject(new Error(localize('resolveShellEnvExitError', "Unexpected exit code from spawned shell (code {0}, signal {1})", code, signal))); } const match = regex.exec(raw); const rawStripped = match ? match[1] : '{}'; try { const env = JSON.parse(rawStripped); if (runAsNode) { env['ELECTRON_RUN_AS_NODE'] = runAsNode; } else { delete env['ELECTRON_RUN_AS_NODE']; } if (noAttach) { env['ELECTRON_NO_ATTACH_CONSOLE'] = noAttach; } else { delete env['ELECTRON_NO_ATTACH_CONSOLE']; } // https://github.com/microsoft/vscode/issues/22593#issuecomment-336050758 delete env['XDG_RUNTIME_DIR']; logService.trace('getUnixShellEnvironment#result', env); resolve(env); } catch (err) { logService.error('getUnixShellEnvironment#errorCaught', toErrorMessage(err)); reject(err); } }); }); } </ins>

import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment'; import { parsePtyHostPort } from 'vs/platform/environment/common/environmentService'; <del> import { getResolvedShellEnv } from 'vs/platform/terminal/node/shellEnv'; </del> <ins> import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv'; </ins> import { ILogService } from 'vs/platform/log/common/log'; import { LogLevelChannelClient } from 'vs/platform/log/common/logIpc'; import { RequestStore } from 'vs/platform/terminal/common/requestStore';

<del> /*--------------------------------------------------------------------------------------------- *  Copyright (c) Microsoft Corporation. All rights reserved. *  Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ import { spawn } from 'child_process'; import { basename } from 'vs/base/common/path'; import { localize } from 'vs/nls'; import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import { canceled, isCancellationError } from 'vs/base/common/errors'; import { IProcessEnvironment, isWindows, OS } from 'vs/base/common/platform'; import { generateUuid } from 'vs/base/common/uuid'; import { getSystemShell } from 'vs/base/node/shell'; import { NativeParsedArgs } from 'vs/platform/environment/common/argv'; import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper'; import { ILogService } from 'vs/platform/log/common/log'; import { Promises } from 'vs/base/common/async'; /** * The maximum of time we accept to wait on resolving the shell * environment before giving up. This ensures we are not blocking * other tasks from running for a too long time period. */ const MAX_SHELL_RESOLVE_TIME = 10000; let unixShellEnvPromise: Promise<typeof process.env> | undefined = undefined; /** * Resolves the shell environment by spawning a shell. This call will cache * the shell spawning so that subsequent invocations use that cached result. * * Will throw an error if: * - we hit a timeout of `MAX_SHELL_RESOLVE_TIME` * - any other error from spawning a shell to figure out the environment */ export async function getResolvedShellEnv(logService: ILogService, args: NativeParsedArgs, env: IProcessEnvironment): Promise<typeof process.env> { // Skip if --force-disable-user-env if (args['force-disable-user-env']) { logService.trace('resolveShellEnv(): skipped (--force-disable-user-env)'); return {}; } // Skip on windows else if (isWindows) { logService.trace('resolveShellEnv(): skipped (Windows)'); return {}; } // Skip if running from CLI already else if (isLaunchedFromCli(env) && !args['force-user-env']) { logService.trace('resolveShellEnv(): skipped (VSCODE_CLI is set)'); return {}; } // Otherwise resolve (macOS, Linux) else { if (isLaunchedFromCli(env)) { logService.trace('resolveShellEnv(): running (--force-user-env)'); } else { logService.trace('resolveShellEnv(): running (macOS/Linux)'); } // Call this only once and cache the promise for // subsequent calls since this operation can be // expensive (spawns a process). if (!unixShellEnvPromise) { unixShellEnvPromise = Promises.withAsyncBody<NodeJS.ProcessEnv>(async (resolve, reject) => { const cts = new CancellationTokenSource(); // Give up resolving shell env after some time const timeout = setTimeout(() => { cts.dispose(true); reject(new Error(localize('resolveShellEnvTimeout', "Unable to resolve your shell environment in a reasonable time. Please review your shell configuration."))); }, MAX_SHELL_RESOLVE_TIME); // Resolve shell env and handle errors try { resolve(await doResolveUnixShellEnv(logService, cts.token)); } catch (error) { if (!isCancellationError(error) && !cts.token.isCancellationRequested) { reject(new Error(localize('resolveShellEnvError', "Unable to resolve your shell environment: {0}", toErrorMessage(error)))); } else { resolve({}); } } finally { clearTimeout(timeout); cts.dispose(); } }); } return unixShellEnvPromise; } } async function doResolveUnixShellEnv(logService: ILogService, token: CancellationToken): Promise<typeof process.env> { const runAsNode = process.env['ELECTRON_RUN_AS_NODE']; logService.trace('getUnixShellEnvironment#runAsNode', runAsNode); const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE']; logService.trace('getUnixShellEnvironment#noAttach', noAttach); const mark = generateUuid().replace(/-/g, '').substr(0, 12); const regex = new RegExp(mark + '(.*)' + mark); const env = { ...process.env, ELECTRON_RUN_AS_NODE: '1', ELECTRON_NO_ATTACH_CONSOLE: '1' }; logService.trace('getUnixShellEnvironment#env', env); const systemShellUnix = await getSystemShell(OS, env); logService.trace('getUnixShellEnvironment#shell', systemShellUnix); return new Promise<typeof process.env>((resolve, reject) => { if (token.isCancellationRequested) { return reject(canceled()); } // handle popular non-POSIX shells const name = basename(systemShellUnix); let command: string, shellArgs: Array<string>; const extraArgs = (process.versions['electron'] && process.versions['microsoft-build']) ? '--ms-enable-electron-run-as-node' : ''; if (/^pwsh(-preview)?$/.test(name)) { // Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how // you escape single quotes inside of a single quoted string. command = `& '${process.execPath}' ${extraArgs} -p '''${mark}'' + JSON.stringify(process.env) + ''${mark}'''`; shellArgs = ['-Login', '-Command']; } else { command = `'${process.execPath}' ${extraArgs} -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`; if (name === 'tcsh') { shellArgs = ['-ic']; } else { shellArgs = ['-ilc']; } } logService.trace('getUnixShellEnvironment#spawn', JSON.stringify(shellArgs), command); const child = spawn(systemShellUnix, [...shellArgs, command], { detached: true, stdio: ['ignore', 'pipe', 'pipe'], env }); token.onCancellationRequested(() => { child.kill(); return reject(canceled()); }); child.on('error', err => { logService.error('getUnixShellEnvironment#errorChildProcess', toErrorMessage(err)); reject(err); }); const buffers: Buffer[] = []; child.stdout.on('data', b => buffers.push(b)); const stderr: Buffer[] = []; child.stderr.on('data', b => stderr.push(b)); child.on('close', (code, signal) => { const raw = Buffer.concat(buffers).toString('utf8'); logService.trace('getUnixShellEnvironment#raw', raw); const stderrStr = Buffer.concat(stderr).toString('utf8'); if (stderrStr.trim()) { logService.trace('getUnixShellEnvironment#stderr', stderrStr); } if (code || signal) { return reject(new Error(localize('resolveShellEnvExitError', "Unexpected exit code from spawned shell (code {0}, signal {1})", code, signal))); } const match = regex.exec(raw); const rawStripped = match ? match[1] : '{}'; try { const env = JSON.parse(rawStripped); if (runAsNode) { env['ELECTRON_RUN_AS_NODE'] = runAsNode; } else { delete env['ELECTRON_RUN_AS_NODE']; } if (noAttach) { env['ELECTRON_NO_ATTACH_CONSOLE'] = noAttach; } else { delete env['ELECTRON_NO_ATTACH_CONSOLE']; } // https://github.com/microsoft/vscode/issues/22593#issuecomment-336050758 delete env['XDG_RUNTIME_DIR']; logService.trace('getUnixShellEnvironment#result', env); resolve(env); } catch (err) { logService.error('getUnixShellEnvironment#errorCaught', toErrorMessage(err)); reject(err); } }); }); } </del>

import { IRemoteConsoleLog } from 'vs/base/common/console'; import { Emitter, Event } from 'vs/base/common/event'; import { NodeSocket, WebSocketNodeSocket } from 'vs/base/parts/ipc/node/ipc.net'; <del> import { getResolvedShellEnv } from 'vs/platform/terminal/node/shellEnv'; </del> <ins> import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv'; </ins> import { ILogService } from 'vs/platform/log/common/log'; import { IRemoteExtensionHostStartParams } from 'vs/platform/remote/common/remoteAgentConnection'; import { IExtHostReadyMessage, IExtHostSocketMessage, IExtHostReduceGraceTimeMessage } from 'vs/workbench/services/extensions/common/extensionHostProtocol';