feat: #750

Author: yazan-abu-obaideh

eslint.config.mjs

@@ -63,6 +63,7 @@ export default defineConfig(
 				"error",
 				{ considerDefaultExhaustiveForUnions: true },
 			],
+			"@typescript-eslint/no-non-null-assertion": "error",
 			"@typescript-eslint/no-unused-vars": [
 				"error",
 				{ varsIgnorePattern: "^_", argsIgnorePattern: "^_" },
@@ -137,6 +138,8 @@ export default defineConfig(
 			"@typescript-eslint/unbound-method": "off",
 			// Empty callbacks are common in test stubs
 			"@typescript-eslint/no-empty-function": "off",
+			// Test assertions often use non-null assertions for brevity
+			"@typescript-eslint/no-non-null-assertion": "off",
 			// Test mocks often have loose typing - relax unsafe rules
 			"@typescript-eslint/no-unsafe-assignment": "off",
 			"@typescript-eslint/no-unsafe-call": "off",

src/api/authInterceptor.ts

@@ -123,8 +123,12 @@ export class AuthInterceptor implements vscode.Disposable {
 			return this.authRequiredPromise;
 		}
 
+		if (!this.onAuthRequired) {
+			return false;
+		}
+
 		this.logger.debug("Triggering re-authentication");
-		this.authRequiredPromise = this.onAuthRequired!(hostname);
+		this.authRequiredPromise = this.onAuthRequired(hostname);
 
 		try {
 			return await this.authRequiredPromise;

src/api/workspace.ts

@@ -7,7 +7,7 @@ import {
 import { spawn } from "node:child_process";
 import * as vscode from "vscode";
 
-import { type CliAuth, getGlobalFlags } from "../cliConfig";
+import { type CliAuth, getGlobalShellFlags } from "../cliConfig";
 import { type FeatureSet } from "../featureSet";
 import { escapeCommandArg } from "../util";
 import { type UnidirectionalStream } from "../websocket/eventStreamConnection";
@@ -65,7 +65,7 @@ export async function startWorkspaceIfStoppedOrFailed(
 
 	return new Promise((resolve, reject) => {
 		const startArgs = [
-			...getGlobalFlags(vscode.workspace.getConfiguration(), auth),
+			...getGlobalShellFlags(vscode.workspace.getConfiguration(), auth),
 			"start",
 			"--yes",
 			createWorkspaceIdentifier(workspace),

src/cliConfig.ts

@@ -23,30 +23,29 @@ export function getGlobalFlagsRaw(
  * Returns global configuration flags for Coder CLI commands with auth values
  * escaped for shell use (e.g., `terminal.sendText`, `spawn({ shell: true })`).
  */
-export function getGlobalFlags(
+export function getGlobalShellFlags(
 	configs: Pick<WorkspaceConfiguration, "get">,
 	auth: CliAuth,
 ): string[] {
-	return buildGlobalFlags(configs, auth, true);
+	return buildGlobalFlags(configs, auth, escapeCommandArg);
 }
 
 /**
  * Returns global configuration flags for Coder CLI commands with raw auth
  * values suitable for `execFile` (no shell escaping).
  */
-export function getGlobalFlagsForExec(
+export function getGlobalFlags(
 	configs: Pick<WorkspaceConfiguration, "get">,
 	auth: CliAuth,
 ): string[] {
-	return buildGlobalFlags(configs, auth, false);
+	return buildGlobalFlags(configs, auth, (s) => s);
 }
 
 function buildGlobalFlags(
 	configs: Pick<WorkspaceConfiguration, "get">,
 	auth: CliAuth,
-	escapeAuth: boolean,
+	esc: (s: string) => string,
 ): string[] {
-	const esc = escapeAuth ? escapeCommandArg : (s: string) => s;
 	const authFlags =
 		auth.mode === "url"
 			? ["--url", esc(auth.url)]

src/commands.ts

@@ -3,7 +3,6 @@ import {
 	type WorkspaceAgent,
 } from "coder/site/src/api/typesGenerated";
 import * as fs from "node:fs/promises";
-import * as os from "node:os";
 import * as path from "node:path";
 import * as semver from "semver";
 import * as vscode from "vscode";
@@ -12,7 +11,7 @@ import { createWorkspaceIdentifier, extractAgents } from "./api/api-helper";
 import { type CoderApi } from "./api/coderApi";
 import {
 	getGlobalFlags,
-	getGlobalFlagsForExec,
+	getGlobalShellFlags,
 	resolveCliAuth,
 } from "./cliConfig";
 import { type CliManager } from "./core/cliManager";
@@ -152,8 +151,8 @@ export class Commands {
 	}
 
 	/**
-	 * Run a speed test against the currently connected workspace and save the
-	 * results to a file chosen by the user.
+	 * Run a speed test against the currently connected workspace and display the
+	 * results in a new editor document.
 	 */
 	public async speedTest(): Promise<void> {
 		const workspace = this.workspace;
@@ -167,7 +166,7 @@ export class Commands {
 			prompt: "Duration for the speed test (e.g., 5s, 10s, 1m)",
 			value: "5s",
 			validateInput: (v) => {
-				return /^\d+[sm]$/.test(v.trim())
+				return /^\d+[smh]$/.test(v.trim())
 					? null
 					: "Enter a duration like 5s, 10s, or 1m";
 			},
@@ -186,7 +185,7 @@ export class Commands {
 				const configDir = this.pathResolver.getGlobalConfigDir(safeHost);
 				const configs = vscode.workspace.getConfiguration();
 				const auth = resolveCliAuth(configs, featureSet, baseUrl, configDir);
-				const globalFlags = getGlobalFlagsForExec(configs, auth);
+				const globalFlags = getGlobalFlags(configs, auth);
 				const workspaceName = createWorkspaceIdentifier(workspace);
 
 				return cliUtils.speedtest(binary, globalFlags, workspaceName, {
@@ -196,7 +195,7 @@ export class Commands {
 			},
 			{
 				location: vscode.ProgressLocation.Notification,
-				title: `Running speed test (${duration.trim()})...`,
+				title: `Running ${duration.trim()} speed test...`,
 				cancellable: true,
 			},
 		);
@@ -211,29 +210,11 @@ export class Commands {
 			return;
 		}
 
-		const defaultName = `speedtest-${workspace.name}-${new Date().toISOString().slice(0, 10)}.json`;
-		const defaultUri = vscode.Uri.joinPath(
-			vscode.workspace.workspaceFolders?.[0]?.uri ??
-				vscode.Uri.file(os.homedir()),
-			defaultName,
-		);
-		const uri = await vscode.window.showSaveDialog({
-			defaultUri,
-			filters: { JSON: ["json"] },
+		const doc = await vscode.workspace.openTextDocument({
+			content: result.value,
+			language: "json",
 		});
-		if (!uri) {
-			return;
-		}
-
-		await vscode.workspace.fs.writeFile(uri, Buffer.from(result.value));
-		const action = await vscode.window.showInformationMessage(
-			"Speed test results saved.",
-			"Open File",
-		);
-		if (action === "Open File") {
-			const doc = await vscode.workspace.openTextDocument(uri);
-			await vscode.window.showTextDocument(doc);
-		}
+		await vscode.window.showTextDocument(doc);
 	}
 
 	/**
@@ -587,7 +568,7 @@ export class Commands {
 					const configDir = this.pathResolver.getGlobalConfigDir(safeHost);
 					const configs = vscode.workspace.getConfiguration();
 					const auth = resolveCliAuth(configs, featureSet, baseUrl, configDir);
-					const globalFlags = getGlobalFlags(configs, auth);
+					const globalFlags = getGlobalShellFlags(configs, auth);
 					terminal.sendText(
 						`${escapeCommandArg(binary)} ${globalFlags.join(" ")} ssh ${app.workspace_name}`,
 					);

src/core/cliUtils.ts

@@ -80,14 +80,14 @@ export async function speedtest(
 	binPath: string,
 	globalFlags: string[],
 	workspaceName: string,
-	options?: { signal?: AbortSignal; duration?: string },
+	options: { signal?: AbortSignal; duration?: string },
 ): Promise<string> {
 	const args = [...globalFlags, "speedtest", workspaceName, "--output", "json"];
-	if (options?.duration) {
+	if (options.duration) {
 		args.push("-t", options.duration);
 	}
 	const result = await promisify(execFile)(binPath, args, {
-		signal: options?.signal,
+		signal: options.signal,
 	});
 	return result.stdout;
 }

src/remote/remote.ts

@@ -22,8 +22,8 @@ import { CoderApi } from "../api/coderApi";
 import { needToken } from "../api/utils";
 import {
 	type CliAuth,
-	getGlobalFlags,
 	getGlobalFlagsRaw,
+	getGlobalShellFlags,
 	getSshFlags,
 	resolveCliAuth,
 } from "../cliConfig";
@@ -673,7 +673,7 @@ export class Remote {
 		const vscodeConfig = vscode.workspace.getConfiguration();
 
 		const escapedBinaryPath = escapeCommandArg(binaryPath);
-		const globalConfig = getGlobalFlags(vscodeConfig, cliAuth);
+		const globalConfig = getGlobalShellFlags(vscodeConfig, cliAuth);
 		const logArgs = await this.getLogArgs(logDir);
 
 		if (useWildcardSSH) {
@@ -865,7 +865,9 @@ export class Remote {
 		const titleMap = new Map(settings.map((s) => [s.setting, s.title]));
 
 		return watchConfigurationChanges(settings, (changedSettings) => {
-			const changedTitles = changedSettings.map((s) => titleMap.get(s)!);
+			const changedTitles = changedSettings
+				.map((s) => titleMap.get(s))
+				.filter((t) => t !== undefined);
 
 			const message =
 				changedTitles.length === 1

src/util.ts

@@ -34,7 +34,7 @@ export function findPort(text: string): number | null {
 	}
 
 	// Get the last match, which is the most recent port.
-	const lastMatch = allMatches.at(-1)!;
+	const lastMatch = allMatches[allMatches.length - 1];
 	// Each capture group corresponds to a different Remote SSH extension log format:
 	// [0] full match, [1] and [2] ms-vscode-remote.remote-ssh,
 	// [3] windsurf/open-remote-ssh/antigravity, [4] anysphere.remote-ssh

test/unit/cliConfig.test.ts

@@ -5,8 +5,8 @@ import { it, expect, describe, vi } from "vitest";
 import {
 	type CliAuth,
 	getGlobalFlags,
-	getGlobalFlagsForExec,
 	getGlobalFlagsRaw,
+	getGlobalShellFlags,
 	getSshFlags,
 	isKeyringEnabled,
 	resolveCliAuth,
@@ -24,7 +24,7 @@ const globalConfigAuth: CliAuth = {
 };
 
 describe("cliConfig", () => {
-	describe("getGlobalFlags", () => {
+	describe("getGlobalShellFlags", () => {
 		const urlAuth: CliAuth = { mode: "url", url: "https://dev.coder.com" };
 
 		interface AuthFlagsCase {
@@ -48,7 +48,9 @@ describe("cliConfig", () => {
 			"should return auth flags for $scenario",
 			({ auth, expectedAuthFlags }) => {
 				const config = new MockConfigurationProvider();
-				expect(getGlobalFlags(config, auth)).toStrictEqual(expectedAuthFlags);
+				expect(getGlobalShellFlags(config, auth)).toStrictEqual(
+					expectedAuthFlags,
+				);
 			},
 		);
 
@@ -59,7 +61,7 @@ describe("cliConfig", () => {
 				"--disable-direct-connections",
 			]);
 
-			expect(getGlobalFlags(config, globalConfigAuth)).toStrictEqual([
+			expect(getGlobalShellFlags(config, globalConfigAuth)).toStrictEqual([
 				"--verbose",
 				"--disable-direct-connections",
 				"--global-config",
@@ -77,7 +79,7 @@ describe("cliConfig", () => {
 					"--disable-direct-connections",
 				]);
 
-				expect(getGlobalFlags(config, globalConfigAuth)).toStrictEqual([
+				expect(getGlobalShellFlags(config, globalConfigAuth)).toStrictEqual([
 					"--verbose",
 					"--disable-direct-connections",
 					"--global-config",
@@ -113,12 +115,12 @@ describe("cliConfig", () => {
 				const config = new MockConfigurationProvider();
 				config.set("coder.globalFlags", flags);
 
-				expect(getGlobalFlags(config, globalConfigAuth)).toStrictEqual([
+				expect(getGlobalShellFlags(config, globalConfigAuth)).toStrictEqual([
 					"-v",
 					"--global-config",
 					'"/config/dir"',
 				]);
-				expect(getGlobalFlags(config, urlAuth)).toStrictEqual([
+				expect(getGlobalShellFlags(config, urlAuth)).toStrictEqual([
 					"-v",
 					"--url",
 					'"https://dev.coder.com"',
@@ -130,7 +132,7 @@ describe("cliConfig", () => {
 			const config = new MockConfigurationProvider();
 			config.set("coder.globalFlags", ["--global-configs", "--use-keyrings"]);
 
-			expect(getGlobalFlags(config, globalConfigAuth)).toStrictEqual([
+			expect(getGlobalShellFlags(config, globalConfigAuth)).toStrictEqual([
 				"--global-configs",
 				"--use-keyrings",
 				"--global-config",
@@ -161,7 +163,7 @@ describe("cliConfig", () => {
 					"--no-feature-warning",
 				]);
 
-				expect(getGlobalFlags(config, auth)).toStrictEqual([
+				expect(getGlobalShellFlags(config, auth)).toStrictEqual([
 					"-v",
 					"--header-command custom", // ignored by CLI
 					"--no-feature-warning",
@@ -173,16 +175,16 @@ describe("cliConfig", () => {
 		);
 	});
 
-	describe("getGlobalFlagsForExec", () => {
+	describe("getGlobalFlags", () => {
 		const urlAuth: CliAuth = { mode: "url", url: "https://dev.coder.com" };
 
 		it("should not escape auth flags", () => {
 			const config = new MockConfigurationProvider();
-			expect(getGlobalFlagsForExec(config, globalConfigAuth)).toStrictEqual([
+			expect(getGlobalFlags(config, globalConfigAuth)).toStrictEqual([
 				"--global-config",
 				"/config/dir",
 			]);
-			expect(getGlobalFlagsForExec(config, urlAuth)).toStrictEqual([
+			expect(getGlobalFlags(config, urlAuth)).toStrictEqual([
 				"--url",
 				"https://dev.coder.com",
 			]);
@@ -191,7 +193,7 @@ describe("cliConfig", () => {
 		it("should still escape header-command flags", () => {
 			const config = new MockConfigurationProvider();
 			config.set("coder.headerCommand", "echo test");
-			expect(getGlobalFlagsForExec(config, globalConfigAuth)).toStrictEqual([
+			expect(getGlobalFlags(config, globalConfigAuth)).toStrictEqual([
 				"--global-config",
 				"/config/dir",
 				"--header-command",
@@ -202,7 +204,7 @@ describe("cliConfig", () => {
 		it("should include user global flags", () => {
 			const config = new MockConfigurationProvider();
 			config.set("coder.globalFlags", ["--verbose"]);
-			expect(getGlobalFlagsForExec(config, globalConfigAuth)).toStrictEqual([
+			expect(getGlobalFlags(config, globalConfigAuth)).toStrictEqual([
 				"--verbose",
 				"--global-config",
 				"/config/dir",

test/unit/core/cliUtils.test.ts

@@ -163,6 +163,7 @@ describe("CliUtils", () => {
 				echoArgsBin,
 				["--global-config", "/tmp/test-config"],
 				"owner/workspace",
+				{},
 			);
 			const args = result.trim().split("\n");
 			expect(args).toEqual([
@@ -180,6 +181,7 @@ describe("CliUtils", () => {
 				echoArgsBin,
 				["--url", "http://localhost:3000"],
 				"owner/workspace",
+				{},
 			);
 			const args = result.trim().split("\n");
 			expect(args).toEqual([
@@ -218,6 +220,7 @@ describe("CliUtils", () => {
 					"/nonexistent/binary",
 					["--global-config", "/tmp"],
 					"owner/workspace",
+					{},
 				),
 			).rejects.toThrow("ENOENT");
 		});