code scripts test if in remote terminal

resources/darwin/bin/code.sh

@@ -3,6 +3,12 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
+# when run in remote terminal, use the remote cli instead
+if [ -n "$VSCODE_IPC_HOOK_CLI" ] && [ -n "$VSCODE_REMOTE_CLI_PATH" ]; then
+ "$VSCODE_REMOTE_CLI_PATH"
+ exit $?
+fi
+
 function app_realpath() {
  SOURCE=$1
  while [ -h "$SOURCE" ]; do
@@ -19,6 +25,7 @@ if [ -z "$APP_PATH" ]; then
  echo "Unable to determine app path from symlink : ${BASH_SOURCE[0]}"
  exit 1
 fi
+
 CONTENTS="$APP_PATH/Contents"
 ELECTRON="$CONTENTS/MacOS/Electron"
 CLI="$CONTENTS/Resources/app/out/cli.js"

resources/linux/bin/code.sh

@@ -35,6 +35,12 @@ if [ "$(id -u)" = "0" ]; then
  fi
 fi
 
+# when run in remote terminal, use the remote cli instead
+if [ -n "$VSCODE_IPC_HOOK_CLI" ] && [ -n "$VSCODE_REMOTE_CLI_PATH" ]; then
+ "$VSCODE_REMOTE_CLI_PATH"
+ exit $?
+fi
+
 if [ ! -L "$0" ]; then
  # if path is not a symlink, find relatively
  VSCODE_PATH="$(dirname "$0")/.."

resources/win32/bin/code.cmd

@@ -1,4 +1,11 @@
 @echo off
+
+rem when run in remote terminal, use the remote cli instead
+if defined VSCODE_IPC_HOOK_CLI if defined VSCODE_REMOTE_CLI_PATH (
+ %VSCODE_REMOTE_CLI_PATH% %*
+ exit
+)
+
 setlocal
 set VSCODE_DEV=
 set ELECTRON_RUN_AS_NODE=1

src/vs/server/node/extensionHostConnection.ts

@@ -21,8 +21,9 @@ import { IProcessEnvironment, isWindows } from 'vs/base/common/platform';
 import { logRemoteEntry } from 'vs/workbench/services/extensions/common/remoteConsoleUtil';
 import { removeDangerousEnvVariables } from 'vs/base/common/processes';
 import { IExtensionHostStatusService } from 'vs/server/node/extensionHostStatusService';
+import { IProductService } from 'vs/platform/product/common/productService';
 
-export async function buildUserEnvironment(startParamsEnv: { [key: string]: string | null } = {}, withUserShellEnvironment: boolean, language: string, isDebug: boolean, environmentService: IServerEnvironmentService, logService: ILogService): Promise<IProcessEnvironment> {
+export async function buildUserEnvironment(startParamsEnv: { [key: string]: string | null } = {}, withUserShellEnvironment: boolean, language: string, isDebug: boolean, environmentService: IServerEnvironmentService, productService: IProductService, logService: ILogService): Promise<IProcessEnvironment> {
  const nlsConfig = await getNLSConfiguration(language, environmentService.userDataPath);
 
  let userShellEnv: typeof process.env = {};
@@ -63,6 +64,8 @@ export async function buildUserEnvironment(startParamsEnv: { [key: string]: stri
  }
  setCaseInsensitive(env, 'PATH', PATH);
 
+ env.VSCODE_REMOTE_CLI_PATH = join(remoteCliBinFolder, productService.applicationName + (isWindows ? '.cmd' : '')); // the `code` command
+
  if (!environmentService.args['without-browser-env-var']) {
  env.BROWSER = join(binFolder, 'helpers', isWindows ? 'browser.cmd' : 'browser.sh'); // a command that opens a browser on the local machine
  }
@@ -108,6 +111,7 @@ export class ExtensionHostConnection {
  socket: NodeSocket | WebSocketNodeSocket,
  initialDataChunk: VSBuffer,
  @IServerEnvironmentService private readonly _environmentService: IServerEnvironmentService,
+ @IProductService private readonly _productService: IProductService,
  @ILogService private readonly _logService: ILogService,
  @IExtensionHostStatusService private readonly _extensionHostStatusService: IExtensionHostStatusService,
  ) {
@@ -194,7 +198,7 @@ export class ExtensionHostConnection {
  execArgv = [`--inspect${startParams.break ? '-brk' : ''}=${startParams.port}`];
  }
 
- const env = await buildUserEnvironment(startParams.env, true, startParams.language, !!startParams.debugId, this._environmentService, this._logService);
+ const env = await buildUserEnvironment(startParams.env, true, startParams.language, !!startParams.debugId, this._environmentService, this._productService, this._logService);
  removeDangerousEnvVariables(env);
 
  const opts = {

src/vs/server/node/remoteTerminalChannel.ts

@@ -188,7 +188,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
  };
 
 
- const baseEnv = await buildUserEnvironment(args.resolverEnv, !!args.shellLaunchConfig.useShellEnvironment, platform.language, false, this._environmentService, this._logService);
+ const baseEnv = await buildUserEnvironment(args.resolverEnv, !!args.shellLaunchConfig.useShellEnvironment, platform.language, false, this._environmentService, this._productService, this._logService);
  this._logService.trace('baseEnv', baseEnv);
 
  const reviveWorkspaceFolder = (workspaceData: IWorkspaceFolderData): IWorkspaceFolder => {