refactor: simplify shimExecFile by removing type casts and promisify

.vscode/settings.json

@@ -14,5 +14,5 @@
 	"vitest.nodeEnv": {
 		"ELECTRON_RUN_AS_NODE": "1"
 	},
-	"vitest.nodeExecutable": "node_modules/.bin/electron"
+	"vitest.nodeExecutable": "node_modules/electron/dist/electron"
 }

package.json

@@ -18,19 +18,20 @@
 	"type": "commonjs",
 	"main": "./dist/extension.js",
 	"scripts": {
-		"build": "concurrently -g -n webviews,extension \"pnpm build:webviews\" \"node esbuild.mjs\"",
-		"build:production": "NODE_ENV=production pnpm build",
+		"build": "concurrently -g -n webviews,extension,compile-tests:integration \"pnpm build:webviews\" \"node esbuild.mjs\" \"pnpm compile-tests:integration\"",
+		"build:production": "cross-env NODE_ENV=production pnpm build",
 		"build:webviews": "pnpm -r --filter \"./packages/*\" --parallel build",
+		"compile-tests:integration": "tsc -p test/integration --outDir out --noCheck",
 		"format": "prettier --write --cache --cache-strategy content .",
 		"format:check": "prettier --check --cache --cache-strategy content .",
 		"lint": "eslint --cache --cache-strategy content .",
 		"lint:fix": "pnpm lint --fix",
 		"package": "pnpm build:production && vsce package --no-dependencies",
 		"package:prerelease": "pnpm build:production && vsce package --pre-release --no-dependencies",
-		"test": "CI=true ELECTRON_RUN_AS_NODE=1 electron node_modules/vitest/vitest.mjs",
-		"test:extension": "ELECTRON_RUN_AS_NODE=1 electron node_modules/vitest/vitest.mjs --project extension",
-		"test:integration": "tsc -p test/integration --outDir out --noCheck && node esbuild.mjs && vscode-test",
-		"test:webview": "ELECTRON_RUN_AS_NODE=1 electron node_modules/vitest/vitest.mjs --project webview",
+		"test": "cross-env CI=true ELECTRON_RUN_AS_NODE=1 electron node_modules/vitest/vitest.mjs",
+		"test:extension": "cross-env ELECTRON_RUN_AS_NODE=1 electron node_modules/vitest/vitest.mjs --project extension",
+		"test:integration": "pnpm compile-tests:integration && node esbuild.mjs && vscode-test",
+		"test:webview": "cross-env ELECTRON_RUN_AS_NODE=1 electron node_modules/vitest/vitest.mjs --project webview",
 		"typecheck": "concurrently -g -n extension,tests,packages \"tsc --noEmit\" \"tsc --noEmit -p test\" \"pnpm typecheck:packages\"",
 		"typecheck:packages": "pnpm -r --filter \"./packages/*\" --parallel typecheck",
 		"watch": "concurrently -g -n extension,webviews \"pnpm watch:extension\" \"pnpm watch:webviews\"",
@@ -609,8 +610,9 @@
 		"bufferutil": "^4.1.0",
 		"coder": "catalog:",
 		"concurrently": "^9.2.1",
+		"cross-env": "^10.1.0",
 		"dayjs": "^1.11.20",
-		"electron": "39.8.1",
+		"electron": "39.8.5",
 		"esbuild": "^0.28.0",
 		"eslint": "^10.2.0",
 		"eslint-config-prettier": "^10.1.8",

test/unit/core/cliExec.test.ts

@@ -1,15 +1,22 @@
 import fs from "fs/promises";
 import os from "os";
 import path from "path";
-import { beforeAll, describe, expect, it } from "vitest";
-
-import * as cliExec from "@/core/cliExec";
+import { beforeAll, describe, expect, it, vi } from "vitest";
 
 import { MockConfigurationProvider } from "../../mocks/testHelpers";
 import { isWindows, writeExecutable } from "../../utils/platform";
 
 import type { CliEnv } from "@/core/cliExec";
 
+// Shim execFile so .js test scripts are run through node cross-platform.
+vi.mock("node:child_process", async (importOriginal) => {
+	const { shimExecFile } = await import("../../utils/platform");
+	return shimExecFile(await importOriginal());
+});
+
+// Import after mock so the module picks up the shimmed execFile.
+const cliExec = await import("@/core/cliExec");
+
 describe("cliExec", () => {
 	const tmp = path.join(os.tmpdir(), "vscode-coder-tests-cliExec");
 
@@ -52,12 +59,12 @@
 
 		it("throws on invalid JSON output", async () => {
 			const bin = await writeExecutable(tmp, "ver-bad-json", echoBin("hello"));
 			await expect(cliExec.version(bin)).rejects.toThrow("Unexpected token");
 		});
 
 		it("throws when JSON has no version field", async () => {
 			const bin = await writeExecutable(tmp, "ver-no-field", echoBin("{}"));
 			await expect(cliExec.version(bin)).rejects.toThrow(
 				"No version found in output",
 			);
 		});
@@ -113,7 +120,7 @@
 				"ver-old-noversion",
 				oldCliBin("unknown flag: --output", "Coder"),
 			);
 			await expect(cliExec.version(bin)).rejects.toThrow("No version found");
 		});
 	});
 
@@ -137,7 +144,7 @@
 				configDir: "/tmp/test-config",
 			});
 			const result = await cliExec.speedtest(env, "owner/workspace");
 			const args = result.trim().split("\n");
 			expect(args).toEqual([
 				"--global-config",
 				"/tmp/test-config",
@@ -154,7 +161,7 @@
 				url: "http://localhost:3000",
 			});
 			const result = await cliExec.speedtest(env, "owner/workspace");
 			const args = result.trim().split("\n");
 			expect(args).toEqual([
 				"--url",
 				"http://localhost:3000",
@@ -171,7 +178,7 @@
 				url: "http://localhost:3000",
 			});
 			const result = await cliExec.speedtest(env, "owner/workspace", "10s");
 			const args = result.trim().split("\n");
 			expect(args).toEqual([
 				"--url",
 				"http://localhost:3000",
@@ -191,7 +198,7 @@
 			});
 			configs.set("coder.headerCommand", "my-header-cmd");
 			const result = await cliExec.speedtest(env, "owner/workspace");
 			const args = result.trim().split("\n");
 			expect(args).toContain("--header-command");
 		});
 

test/unit/remote/sshProcess.test.ts

@@ -1,6 +1,7 @@
 import find from "find-process";
 import { vol } from "memfs";
 import * as fsPromises from "node:fs/promises";
+import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import {
@@ -313,8 +314,10 @@ describe("SshProcessMonitor", () => {
 			});
 			const logPath = await waitForEvent(monitor.onLogFilePathChange);
 
-			expect(logPath).toBe("/proxy-logs/999.log");
-			expect(monitor.getLogFilePath()).toBe("/proxy-logs/999.log");
+			expect(logPath).toBe(path.join("/proxy-logs", "999.log"));
+			expect(monitor.getLogFilePath()).toBe(
+				path.join("/proxy-logs", "999.log"),
+			);
 		});
 
 		it("finds log file with prefix pattern", async () => {
@@ -330,7 +333,7 @@ describe("SshProcessMonitor", () => {
 			});
 			const logPath = await waitForEvent(monitor.onLogFilePathChange);
 
-			expect(logPath).toBe("/proxy-logs/coder-ssh-999.log");
+			expect(logPath).toBe(path.join("/proxy-logs", "coder-ssh-999.log"));
 		});
 
 		it("returns undefined when no proxyLogDir set", async () => {
@@ -373,7 +376,7 @@ describe("SshProcessMonitor", () => {
 			});
 			const logPath = await waitForEvent(monitor.onLogFilePathChange);
 
-			expect(logPath).toBe("/proxy-logs/2024-01-03-999.log");
+			expect(logPath).toBe(path.join("/proxy-logs", "2024-01-03-999.log"));
 		});
 
 		it("sorts log files using localeCompare for consistent cross-platform ordering", async () => {
@@ -395,7 +398,7 @@ describe("SshProcessMonitor", () => {
 
 			// With localeCompare: ["a", "Z"] -> reversed -> "Z" first
 			// With plain sort(): ["Z", "a"] -> reversed -> "a" first (WRONG)
-			expect(logPath).toBe("/proxy-logs/Z-999.log");
+			expect(logPath).toBe(path.join("/proxy-logs", "Z-999.log"));
 		});
 	});