Use CLI directly.

Author: GirlBossRush

src/node/cli.ts

@@ -652,21 +652,6 @@ function bindAddrFromAllSources(...argsConfig: Args[]): Addr {
   return addr
 }
 
-export const shouldRunVsCodeCli = (args: Args): boolean => {
-  // Create new interface with only Arg keys
-  // keyof Args
-  // Turn that into an array
-  // Array<...>
-  type ExtensionArgs = Array<keyof Args>
-  const extensionRelatedArgs: ExtensionArgs = ["list-extensions", "install-extension", "uninstall-extension"]
-
-  const argKeys = Object.keys(args)
-
-  // If any of the extensionRelatedArgs are included in args
-  // then we don't want to run the vscode cli
-  return extensionRelatedArgs.some((arg) => argKeys.includes(arg))
-}
-
 /**
  * Determine if it looks like the user is trying to open a file or folder in an
  * existing instance. The arguments here should be the arguments the user

src/node/entry.ts

@@ -1,14 +1,7 @@
 import { logger } from "@coder/logger"
-import {
-  optionDescriptions,
-  parse,
-  readConfigFile,
-  setDefaults,
-  shouldOpenInExistingInstance,
-  shouldRunVsCodeCli,
-} from "./cli"
+import { optionDescriptions, parse, readConfigFile, setDefaults, shouldOpenInExistingInstance } from "./cli"
 import { commit, version } from "./constants"
-import { openInExistingInstance, runCodeServer, runVsCodeCli } from "./main"
+import { openInExistingInstance, runCodeServer, runVsCodeCli, shouldSpawnCliProcess } from "./main"
 import { monkeyPatchProxyProtocols } from "./proxy_agent"
 import { isChild, wrapper } from "./wrapper"
 
@@ -59,8 +52,8 @@ async function entry(): Promise<void> {
     return
   }
 
-  if (shouldRunVsCodeCli(args)) {
-    return runVsCodeCli(args)
+  if (await shouldSpawnCliProcess(args)) {
+    return runVsCodeCli()
   }
 
   const socketPath = await shouldOpenInExistingInstance(cliArgs)

src/node/main.ts

@@ -5,23 +5,53 @@ import { plural } from "../common/util"
 import { createApp, ensureAddress } from "./app"
 import { AuthType, DefaultedArgs, Feature } from "./cli"
 import { coderCloudBind } from "./coder_cloud"
-import { commit, version } from "./constants"
+import { commit, version, vsRootPath } from "./constants"
 import { startLink } from "./link"
 import { register } from "./routes"
 import { humanPath, isFile, loadAMDModule, open } from "./util"
 
+export const shouldSpawnCliProcess = async (args: DefaultedArgs): Promise<boolean> => {
+  const shouldSpawn = await loadAMDModule<(argv: DefaultedArgs) => boolean>("vs/code/node/cli", "shouldSpawnCliProcess")
+
+  return shouldSpawn(args)
+}
+
 /**
  * This is useful when an CLI arg should be passed to VS Code directly,
  * such as when managing extensions.
  * @deprecated This should be removed when code-server merges with lib/vscode.
  */
-export const runVsCodeCli = async (args: DefaultedArgs): Promise<void> => {
+export const runVsCodeCli = async (): Promise<void> => {
   logger.debug("Running VS Code CLI")
 
-  const cliProcessMain = await loadAMDModule<CodeServerLib.IMainCli["main"]>("vs/code/node/cliProcessMain", "main")
+  // Delete `VSCODE_CWD` very early even before
+  // importing bootstrap files. We have seen
+  // reports where `code .` would use the wrong
+  // current working directory due to our variable
+  // somehow escaping to the parent shell
+  // (https://github.com/microsoft/vscode/issues/126399)
+  delete process.env["VSCODE_CWD"]
+
+  const bootstrap = require(path.join(vsRootPath, "out", "bootstrap"))
+  const bootstrapNode = require(path.join(vsRootPath, "out", "bootstrap-node"))
+  const product = require(path.join(vsRootPath, "product.json"))
+
+  // Avoid Monkey Patches from Application Insights
+  bootstrap.avoidMonkeyPatchFromAppInsights()
+
+  // Enable portable support
+  bootstrapNode.configurePortable(product)
+
+  // Enable ASAR support
+  bootstrap.enableASARSupport()
+
+  // Signal processes that we got launched as CLI
+  process.env["VSCODE_CLI"] = "1"
+
+  const cliProcessMain = await loadAMDModule<CodeServerLib.IMainCli["main"]>("vs/code/node/cli", "initialize")
 
   try {
-    await cliProcessMain(args)
+    await cliProcessMain(process.argv)
   } catch (error: any) {
     logger.error("Got error from VS Code", error)
   }

vendor/package.json

@@ -7,6 +7,6 @@
     "postinstall": "./postinstall.sh"
   },
   "devDependencies": {
-    "code-oss-dev": "cdr/vscode#6310f73bbded91cfadc64c08d9be503bf2f633cc"
+    "code-oss-dev": "cdr/vscode#54bde0ad8502bd34c91dc65b8430bf7710048009"
   }
 }

vendor/yarn.lock

@@ -296,9 +296,9 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
-code-oss-dev@cdr/vscode#6310f73bbded91cfadc64c08d9be503bf2f633cc:
+code-oss-dev@cdr/vscode#54bde0ad8502bd34c91dc65b8430bf7710048009:
   version "1.61.1"
-  resolved "https://codeload.github.com/cdr/vscode/tar.gz/6310f73bbded91cfadc64c08d9be503bf2f633cc"
+  resolved "https://codeload.github.com/cdr/vscode/tar.gz/54bde0ad8502bd34c91dc65b8430bf7710048009"
   dependencies:
     "@microsoft/applicationinsights-web" "^2.6.4"
     "@vscode/sqlite3" "4.0.12"