Add service container and improve import/order

Author: EhabY

.eslintrc.json

@@ -53,17 +53,16 @@
 				"groups": [
 					["builtin", "external"],
 					"internal",
-					["parent", "sibling", "index"],
+					"parent",
+					["sibling", "index"],
 					"type"
 				],
 				"pathGroups": [
-					{ "pattern": "@/**", "group": "internal", "position": "after" }
+					{ "pattern": "@/**", "group": "internal", "position": "before" }
 				],
-				// Don't reclassify real externals like @babel/* into the alias group
 				"pathGroupsExcludedImportTypes": ["builtin", "external"],
 				"newlines-between": "always",
-				"alphabetize": { "order": "asc", "caseInsensitive": true },
-				"distinctGroup": true // separates type imports into the "type" group
+				"alphabetize": { "order": "asc", "caseInsensitive": true }
 			}
 		],
 		// Prevent duplicates and prefer merging into a single import

package.json

@@ -352,6 +352,7 @@
 		"eslint-plugin-prettier": "^5.5.4",
 		"glob": "^10.4.2",
 		"jsonc-eslint-parser": "^2.4.0",
+		"markdown-eslint-parser": "^1.2.1",
 		"memfs": "^4.46.0",
 		"nyc": "^17.1.0",
 		"prettier": "^3.5.3",

src/api/coderApi.ts

@@ -12,7 +12,6 @@ import { type ClientOptions } from "ws";
 
 import { CertificateError } from "../error";
 import { getHeaderCommand, getHeaders } from "../headers";
-import { createHttpAgent } from "./utils";
 import {
 	createRequestMeta,
 	logRequest,
@@ -30,6 +29,8 @@ import {
 	type OneWayWebSocketInit,
 } from "../websocket/oneWayWebSocket";
 
+import { createHttpAgent } from "./utils";
+
 const coderSessionTokenHeader = "Coder-Session-Token";
 
 type WorkspaceConfigurationProvider = () => WorkspaceConfiguration;

src/api/utils.ts

@@ -2,9 +2,10 @@ import fs from "fs";
 import { ProxyAgent } from "proxy-agent";
 import { type WorkspaceConfiguration } from "vscode";
 
-import { getProxyForUrl } from "./proxy";
 import { expandPath } from "../util";
 
+import { getProxyForUrl } from "./proxy";
+
 /**
  * Return whether the API will need a token for authorization.
  * If mTLS is in use (as specified by the cert or key files being set) then

src/api/workspace.ts

@@ -6,6 +6,7 @@ import * as vscode from "vscode";
 import { type FeatureSet } from "../featureSet";
 import { getGlobalFlags } from "../globalFlags";
 import { escapeCommandArg } from "../util";
+
 import { errToStr, createWorkspaceIdentifier } from "./api-helper";
 import { type CoderApi } from "./coderApi";
 

src/cliUtils.test.ts

@@ -11,6 +11,7 @@ import { createWorkspaceIdentifier, extractAgents } from "./api/api-helper";
 import { CoderApi } from "./api/coderApi";
 import { needToken } from "./api/utils";
 import { type CliManager } from "./core/cliManager";
+import { type ServiceContainer } from "./core/container";
 import { type MementoManager } from "./core/mementoManager";
 import { type PathResolver } from "./core/pathResolver";
 import { type SecretsManager } from "./core/secretsManager";
@@ -25,6 +26,12 @@ import {
 } from "./workspace/workspacesProvider";
 
 export class Commands {
+	private readonly vscodeProposed: typeof vscode;
+	private readonly logger: Logger;
+	private readonly pathResolver: PathResolver;
+	private readonly mementoManager: MementoManager;
+	private readonly secretsManager: SecretsManager;
+	private readonly cliManager: CliManager;
 	// These will only be populated when actively connected to a workspace and are
 	// used in commands.  Because commands can be executed by the user, it is not
 	// possible to pass in arguments, so we have to store the current workspace
@@ -37,14 +44,16 @@ export class Commands {
 	public workspaceRestClient?: Api;
 
 	public constructor(
-		private readonly vscodeProposed: typeof vscode,
+		serviceContainer: ServiceContainer,
 		private readonly restClient: Api,
-		private readonly logger: Logger,
-		private readonly pathResolver: PathResolver,
-		private readonly mementoManager: MementoManager,
-		private readonly secretsManager: SecretsManager,
-		private readonly cliManager: CliManager,
-	) {}
+	) {
+		this.vscodeProposed = serviceContainer.getVsCodeProposed();
+		this.logger = serviceContainer.getLogger();
+		this.pathResolver = serviceContainer.getPathResolver();
+		this.mementoManager = serviceContainer.getMementoManager();
+		this.secretsManager = serviceContainer.getSecretsManager();
+		this.cliManager = serviceContainer.getCliManager();
+	}
 
 	/**
 	 * Find the requested agent if specified, otherwise return the agent if there

src/commands.ts

@@ -12,9 +12,10 @@ import * as semver from "semver";
 import * as vscode from "vscode";
 
 import { errToStr } from "../api/api-helper";
-import * as cli from "./cliUtils";
 import { type Logger } from "../logging/logger";
 import * as pgp from "../pgp";
+
+import * as cliUtils from "./cliUtils";
 import { type PathResolver } from "./pathResolver";
 
 export class CliManager {
@@ -58,16 +59,16 @@ export class CliManager {
 		// downloads are disabled, we can return early.
 		const binPath = path.join(
 			this.pathResolver.getBinaryCachePath(label),
-			cli.name(),
+			cliUtils.name(),
 		);
 		this.output.info("Using binary path", binPath);
-		const stat = await cli.stat(binPath);
+		const stat = await cliUtils.stat(binPath);
 		if (stat === undefined) {
 			this.output.info("No existing binary found, starting download");
 		} else {
 			this.output.info("Existing binary size is", prettyBytes(stat.size));
 			try {
-				const version = await cli.version(binPath);
+				const version = await cliUtils.version(binPath);
 				this.output.info("Existing binary version is", version);
 				// If we have the right version we can avoid the request entirely.
 				if (version === buildInfo.version) {
@@ -97,7 +98,7 @@ export class CliManager {
 		}
 
 		// Remove any left-over old or temporary binaries and signatures.
-		const removed = await cli.rmOld(binPath);
+		const removed = await cliUtils.rmOld(binPath);
 		removed.forEach(({ fileName, error }) => {
 			if (error) {
 				this.output.warn("Failed to remove", fileName, error);
@@ -107,7 +108,7 @@ export class CliManager {
 		});
 
 		// Figure out where to get the binary.
-		const binName = cli.name();
+		const binName = cliUtils.name();
 		const configSource = cfg.get("binarySource");
 		const binSource =
 			configSource && String(configSource).trim().length > 0
@@ -117,7 +118,7 @@ export class CliManager {
 
 		// Ideally we already caught that this was the right version and returned
 		// early, but just in case set the ETag.
-		const etag = stat !== undefined ? await cli.eTag(binPath) : "";
+		const etag = stat !== undefined ? await cliUtils.eTag(binPath) : "";
 		this.output.info("Using ETag", etag);
 
 		// Download the binary to a temporary file.
@@ -173,14 +174,14 @@ export class CliManager {
 				await fs.rename(tempFile, binPath);
 
 				// For debugging, to see if the binary only partially downloaded.
-				const newStat = await cli.stat(binPath);
+				const newStat = await cliUtils.stat(binPath);
 				this.output.info(
 					"Downloaded binary size is",
 					prettyBytes(newStat?.size || 0),
 				);
 
 				// Make sure we can execute this new binary.
-				const version = await cli.version(binPath);
+				const version = await cliUtils.version(binPath);
 				this.output.info("Downloaded binary version is", version);
 
 				return binPath;
@@ -199,8 +200,8 @@ export class CliManager {
 						if (!value) {
 							return;
 						}
-						const os = cli.goos();
-						const arch = cli.goarch();
+						const os = cliUtils.goos();
+						const arch = cliUtils.goarch();
 						const params = new URLSearchParams({
 							title: `Support the \`${os}-${arch}\` platform`,
 							body: `I'd like to use the \`${os}-${arch}\` architecture with the VS Code extension.`,
@@ -223,7 +224,7 @@ export class CliManager {
 							return;
 						}
 						const params = new URLSearchParams({
-							title: `Failed to download binary on \`${cli.goos()}-${cli.goarch()}\``,
+							title: `Failed to download binary on \`${cliUtils.goos()}-${cliUtils.goarch()}\``,
 							body: `Received status code \`${status}\` when downloading the binary.`,
 						});
 						const uri = vscode.Uri.parse(