From 9d9f3a41ab2b5fe57b8b0431392ec6c3a6690759 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 7 Dec 2021 18:20:57 -0600
Subject: [PATCH] Fix spawning code-server within code-server (#4590)

* Remove extra VS Code CLI spawn

We already spawn VS Code's CLI when necessary in the lines below.
Having the CLI spawn unconditionally when in a VS Code environment makes
it impossible to run code-server within code-server (for example to
develop it).

* Update VS Code

This sanitizes our environment variables so code-server does not always
think it is a child spawn.

Fixes https://github.com/cdr/code-server/issues/4519.
---
 src/node/entry.ts   | 21 +--------------------
 vendor/package.json |  2 +-
 vendor/yarn.lock    |  4 ++--
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/node/entry.ts b/src/node/entry.ts
index 685f62f3..27b76f4f 100644
--- a/src/node/entry.ts
+++ b/src/node/entry.ts
@@ -1,32 +1,13 @@
 import { logger } from "@coder/logger"
 import { optionDescriptions, parse, readConfigFile, setDefaults, shouldOpenInExistingInstance } from "./cli"
-import { commit, pkgName, version } from "./constants"
+import { commit, version } from "./constants"
 import { openInExistingInstance, runCodeServer, runVsCodeCli, shouldSpawnCliProcess } from "./main"
 import { monkeyPatchProxyProtocols } from "./proxy_agent"
-import { loadAMDModule } from "./util"
 import { isChild, wrapper } from "./wrapper"
 
-const cliPipe = process.env["VSCODE_IPC_HOOK_CLI"] as string
-const cliCommand = process.env["VSCODE_CLIENT_COMMAND"] as string
-
 async function entry(): Promise<void> {
   monkeyPatchProxyProtocols()
 
-  if (cliPipe || cliCommand) {
-    const remoteAgentMain = await loadAMDModule<CodeServerLib.RemoteCLIMain>("vs/server/remoteCli", "main")
-
-    remoteAgentMain(
-      {
-        productName: pkgName,
-        version,
-        commit,
-        executableName: pkgName,
-      },
-      process.argv.slice(2),
-    )
-    return
-  }
-
   // There's no need to check flags like --help or to spawn in an existing
   // instance for the child process because these would have already happened in
   // the parent and the child wouldn't have been spawned. We also get the
diff --git a/vendor/package.json b/vendor/package.json
index 40fe2a2a..12e95f62 100644
--- a/vendor/package.json
+++ b/vendor/package.json
@@ -7,6 +7,6 @@
     "postinstall": "./postinstall.sh"
   },
   "devDependencies": {
-    "code-oss-dev": "cdr/vscode#5e0c6f3b95ed032e62c49101ae502a46c62ef202"
+    "code-oss-dev": "cdr/vscode#c2a251c6afaa13fbebf97fcd8a68192f8cf46031"
   }
 }
diff --git a/vendor/yarn.lock b/vendor/yarn.lock
index 2f652205..4a8833af 100644
--- a/vendor/yarn.lock
+++ b/vendor/yarn.lock
@@ -296,9 +296,9 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
-code-oss-dev@cdr/vscode#5e0c6f3b95ed032e62c49101ae502a46c62ef202:
+code-oss-dev@cdr/vscode#c2a251c6afaa13fbebf97fcd8a68192f8cf46031:
   version "1.61.1"
-  resolved "https://codeload.github.com/cdr/vscode/tar.gz/5e0c6f3b95ed032e62c49101ae502a46c62ef202"
+  resolved "https://codeload.github.com/cdr/vscode/tar.gz/c2a251c6afaa13fbebf97fcd8a68192f8cf46031"
   dependencies:
     "@microsoft/applicationinsights-web" "^2.6.4"
     "@vscode/sqlite3" "4.0.12"