Address review comments

extensions/ql-vscode/CHANGELOG.md

@@ -3,7 +3,7 @@
 ## [UNRELEASED]
 
 - Restart the CodeQL language server whenever the _CodeQL: Restart Query Server_ command is invoked. This avoids bugs where the CLI version changes to support new language features, but the language server is not updated. [#2238](https://github.com/github/vscode-codeql/pull/2238)
-- Avoid requiring a manual restart of the query server when the [external CLI config file](https://docs.github.com/en/code-security/codeql-cli/using-the-codeql-cli/specifying-command-options-in-a-codeql-configuration-file#using-a-codeql-configuration-file) changes. [#22892289)
+- Avoid requiring a manual restart of the query server when the [external CLI config file](https://docs.github.com/en/code-security/codeql-cli/using-the-codeql-cli/specifying-command-options-in-a-codeql-configuration-file#using-a-codeql-configuration-file) changes. [#2289](https://github.com/github/vscode-codeql/pull/2289)
 
 ## 1.8.1 - 23 March 2023
 

extensions/ql-vscode/src/extension.ts

@@ -13,7 +13,7 @@ import {
   workspace,
 } from "vscode";
 import { LanguageClient } from "vscode-languageclient/node";
-import { arch, platform } from "os";
+import { arch, platform, homedir } from "os";
 import { ensureDir } from "fs-extra";
 import { join } from "path";
 import { dirSync } from "tmp-promise";
@@ -1019,8 +1019,9 @@ async function activateWithInstalledDistribution(
  * See https://docs.github.com/en/code-security/codeql-cli/using-the-codeql-cli/specifying-command-options-in-a-codeql-configuration-file#using-a-codeql-configuration-file
  */
 function watchExternalConfigFile(app: ExtensionApp, ctx: ExtensionContext) {
-  if (process.env.HOME) {
-    const configPath = join(process.env.HOME, ".config/codeql", "config");
+  const home = homedir();
+  if (home) {
+    const configPath = join(home, ".config", "codeql", "config");
     const configWatcher = watch(configPath, {
       // These options avoid firing the event twice.
       persistent: true,