Address review comments + Add some tests

Author: EhabY

CHANGELOG.md

@@ -8,7 +8,7 @@
 
 ### Added
 
-- Add support for CLI global flag configurations.
+- Add support for CLI global flag configurations through the `coder.globalFlags` setting.
 
 ## [1.10.1](https://github.com/coder/vscode-coder/releases/tag/v1.10.1) 2025-08-13
 

package.json

@@ -121,7 +121,7 @@
 					"default": false
 				},
 				"coder.globalFlags": {
-					"markdownDescription": "Global flags to pass to every Coder CLI invocation. Enter each flag as a separate array item; values are passed verbatim and in order. Do **not** include the `coder` command itself. See the [CLI reference](https://coder.com/docs/reference/cli) for available global flags.\n\nNote that the `#coder.headerCommand#` setting **takes precedence** and will override any `--header-command` value specified here.",
+					"markdownDescription": "Global flags to pass to every Coder CLI invocation. Enter each flag as a separate array item; values are passed verbatim and in order. Do **not** include the `coder` command itself. See the [CLI reference](https://coder.com/docs/reference/cli) for available global flags.\n\nNote that for `--header-command`, precedence is: `#coder.headerCommand#` setting, then `CODER_HEADER_COMMAND` environment variable, then the value specified here. The `--global-config` flag is explicitly ignored.",
 					"type": "array",
 					"items": {
 						"type": "string"

src/globalFlags.test.ts

@@ -0,0 +1,78 @@
+import { it, expect, describe } from "vitest";
+import { WorkspaceConfiguration } from "vscode";
+import { getGlobalFlags } from "./globalFlags";
+
+describe("Global flags suite", () => {
+	it("should return global-config and header args when no global flags configured", () => {
+		const config = {
+			get: () => undefined,
+		} as unknown as WorkspaceConfiguration;
+
+		expect(getGlobalFlags(config, "/config/dir")).toStrictEqual([
+			"--global-config",
+			'"/config/dir"',
+		]);
+	});
+
+	it("should return global flags from config with global-config appended", () => {
+		const config = {
+			get: (key: string) =>
+				key === "coder.globalFlags"
+					? ["--verbose", "--disable-direct-connections"]
+					: undefined,
+		} as unknown as WorkspaceConfiguration;
+
+		expect(getGlobalFlags(config, "/config/dir")).toStrictEqual([
+			"--verbose",
+			"--disable-direct-connections",
+			"--global-config",
+			'"/config/dir"',
+		]);
+	});
+
+	it("should not filter duplicate global-config flags, last takes precedence", () => {
+		const config = {
+			get: (key: string) =>
+				key === "coder.globalFlags"
+					? [
+							"-v",
+							"--global-config /path/to/ignored",
+							"--disable-direct-connections",
+						]
+					: undefined,
+		} as unknown as WorkspaceConfiguration;
+
+		expect(getGlobalFlags(config, "/config/dir")).toStrictEqual([
+			"-v",
+			"--global-config /path/to/ignored",
+			"--disable-direct-connections",
+			"--global-config",
+			'"/config/dir"',
+		]);
+	});
+
+	it("should not filter header-command flags, header args appended at end", () => {
+		const config = {
+			get: (key: string) => {
+				if (key === "coder.headerCommand") {
+					return "echo test";
+				}
+				if (key === "coder.globalFlags") {
+					return ["-v", "--header-command custom", "--no-feature-warning"];
+				}
+				return undefined;
+			},
+		} as unknown as WorkspaceConfiguration;
+
+		const result = getGlobalFlags(config, "/config/dir");
+		expect(result).toStrictEqual([
+			"-v",
+			"--header-command custom", // ignored by CLI
+			"--no-feature-warning",
+			"--global-config",
+			'"/config/dir"',
+			"--header-command",
+			"'echo test'",
+		]);
+	});
+});

src/globalFlags.ts

@@ -4,26 +4,12 @@ import { escapeCommandArg } from "./util";
 
 export function getGlobalFlags(
 	configs: WorkspaceConfiguration,
-	configDir?: string,
+	configDir: string,
 ): string[] {
-	const globalFlags = configs.get<string[]>("coder.globalFlags") || [];
-	const headerArgs = getHeaderArgs(configs);
-	const globalConfigArgs = configDir
-		? ["--global-config", escapeCommandArg(configDir)]
-		: [];
-
-	// Precedence of "coder.headerCommand" is higher than "coder.globalConfig" with the "--header-command" flag
-	let filteredGlobalFlags = globalFlags;
-	if (headerArgs.length > 0) {
-		filteredGlobalFlags = globalFlags.filter(
-			(flag) => !flag.startsWith("--header-command"),
-		);
-	}
-
-	if (globalConfigArgs.length > 0) {
-		filteredGlobalFlags = globalFlags.filter(
-			(flag) => !flag.startsWith("--global-config"),
-		);
-	}
-	return [...filteredGlobalFlags, ...headerArgs, ...globalConfigArgs];
+	// Last takes precedence/overrides previous ones
+	return [
+		...(configs.get<string[]>("coder.globalFlags") || []),
+		...["--global-config", escapeCommandArg(configDir)],
+		...getHeaderArgs(configs),
+	];
 }

src/remote.ts

@@ -762,7 +762,7 @@ export class Remote {
 			? `${AuthorityPrefix}.${label}--`
 			: `${AuthorityPrefix}--`;
 
-		const globalConfigs = this.globalConfigs(featureSet, label);
+		const globalConfigs = this.globalConfigs(label);
 
 		const proxyCommand = featureSet.wildcardSSH
 			? `${escapeCommandArg(binaryPath)}${globalConfigs} ssh --stdio --usage-app=vscode --disable-autostart --network-info-dir ${escapeCommandArg(this.storage.getNetworkInfoPath())}${await this.formatLogArg(logDir)} --ssh-host-prefix ${hostPrefix} %h`
@@ -824,17 +824,12 @@ export class Remote {
 		return sshConfig.getRaw();
 	}
 
-	private globalConfigs(featureSet: FeatureSet, label: string): string {
+	private globalConfigs(label: string): string {
 		const vscodeConfig = vscode.workspace.getConfiguration();
-		let args: string[];
-		if (featureSet.wildcardSSH) {
-			args = getGlobalFlags(
-				vscodeConfig,
-				path.dirname(this.storage.getSessionTokenPath(label)),
-			);
-		} else {
-			args = getGlobalFlags(vscodeConfig);
-		}
+		const args: string[] = getGlobalFlags(
+			vscodeConfig,
+			path.dirname(this.storage.getSessionTokenPath(label)),
+		);
 		return args.length === 0 ? "" : ` ${args.join(" ")}`;
 	}