More review comments fixes

Author: EhabY

CHANGELOG.md

@@ -11,9 +11,9 @@
 ### Added
 
 - Add support for CLI global flag configurations through the `coder.globalFlags` setting.
-- Add logging for all REST and some WebSocket traffic, with REST verbosity configurable via `coder.httpClientLogLevel` (`none`, `basic`, `headers`, `body`).
-- An Axios interceptor that tags each request with a UUID to correlate with its response and measure duration.
-- Lifecycle logs for WebSocket creation, errors, and closures.
+- Add logging for all REST traffic. Verbosity is configurable via `coder.httpClientLogLevel` (`none`, `basic`, `headers`, `body`).
+- Add lifecycle logs for WebSocket creation, errors, and closures.
+- Include UUIDs in REST and WebSocket logs to correlate events and measure duration.
 
 ## [1.10.1](https://github.com/coder/vscode-coder/releases/tag/v1.10.1) 2025-08-13
 

src/agentMetadataHelper.ts

@@ -5,7 +5,7 @@ import {
 	AgentMetadataEventSchemaArray,
 	errToStr,
 } from "./api/api-helper";
-import { CodeApi } from "./api/codeApi";
+import { CoderApi } from "./api/coderApi";
 
 export type AgentMetadataWatcher = {
 	onChange: vscode.EventEmitter<null>["event"];
@@ -20,7 +20,7 @@ export type AgentMetadataWatcher = {
  */
 export function createAgentMetadataWatcher(
 	agentId: WorkspaceAgent["id"],
-	client: CodeApi,
+	client: CoderApi,
 ): AgentMetadataWatcher {
 	const socket = client.watchAgentMetadata(agentId);
 

src/api/codeApi.ts renamed to src/api/coderApi.ts

@@ -20,8 +20,11 @@ import {
 import { Logger } from "../logging/logger";
 import { RequestConfigWithMeta, HttpClientLogLevel } from "../logging/types";
 import { WsLogger } from "../logging/wsLogger";
-import { OneWayWebSocket } from "../websocket/oneWayWebSocket";
-import { createHttpAgent } from "./auth";
+import {
+	OneWayWebSocket,
+	OneWayWebSocketInit,
+} from "../websocket/oneWayWebSocket";
+import { createHttpAgent } from "./utils";
 
 const coderSessionTokenHeader = "Coder-Session-Token";
 
@@ -31,7 +34,7 @@ type WorkspaceConfigurationProvider = () => WorkspaceConfiguration;
  * Unified API class that includes both REST API methods from the base Api class
  * and WebSocket methods for real-time functionality.
  */
-export class CodeApi extends Api {
+export class CoderApi extends Api {
 	private constructor(
 		private readonly output: Logger,
 		private readonly configProvider: WorkspaceConfigurationProvider,
@@ -40,16 +43,16 @@ export class CodeApi extends Api {
 	}
 
 	/**
-	 * Create a new CodeApi instance with the provided configuration.
+	 * Create a new CoderApi instance with the provided configuration.
 	 * Automatically sets up logging interceptors and certificate handling.
 	 */
 	static create(
 		baseUrl: string,
 		token: string | undefined,
 		output: Logger,
 		configProvider: WorkspaceConfigurationProvider,
-	): CodeApi {
-		const client = new CodeApi(output, configProvider);
+	): CoderApi {
+		const client = new CoderApi(output, configProvider);
 		client.setHost(baseUrl);
 		if (token) {
 			client.setSessionToken(token);
@@ -106,12 +109,9 @@ export class CodeApi extends Api {
 		return socket;
 	};
 
-	private createWebSocket<TData = unknown>(configs: {
-		apiRoute: string;
-		protocols?: string | string[];
-		searchParams?: Record<string, string> | URLSearchParams;
-		options?: ClientOptions;
-	}) {
+	private createWebSocket<TData = unknown>(
+		configs: Omit<OneWayWebSocketInit, "location">,
+	) {
 		const baseUrlRaw = this.getAxiosInstance().defaults.baseURL;
 		if (!baseUrlRaw) {
 			throw new Error("No base URL set on REST client");
@@ -163,10 +163,10 @@ export class CodeApi extends Api {
 }
 
 /**
- * Set up logging and request interceptors for the CodeApi instance.
+ * Set up logging and request interceptors for the CoderApi instance.
  */
 function setupInterceptors(
-	client: CodeApi,
+	client: CoderApi,
 	baseUrl: string,
 	output: Logger,
 	configProvider: WorkspaceConfigurationProvider,

src/api/auth.ts renamed to src/api/utils.ts

@@ -5,7 +5,7 @@ import * as vscode from "vscode";
 import { FeatureSet } from "../featureSet";
 import { getGlobalFlags } from "../globalFlags";
 import { errToStr, createWorkspaceIdentifier } from "./api-helper";
-import { CodeApi } from "./codeApi";
+import { CoderApi } from "./coderApi";
 
 /**
  * Start or update a workspace and return the updated workspace.
@@ -82,7 +82,7 @@ export async function startWorkspaceIfStoppedOrFailed(
  * Once completed, fetch the workspace again and return it.
  */
 export async function waitForBuild(
-	client: CodeApi,
+	client: CoderApi,
 	writeEmitter: vscode.EventEmitter<string>,
 	workspace: Workspace,
 ): Promise<Workspace> {

src/api/workspace.ts

@@ -8,16 +8,16 @@ import {
 import path from "node:path";
 import * as vscode from "vscode";
 import { createWorkspaceIdentifier, extractAgents } from "./api/api-helper";
-import { needToken } from "./api/auth";
-import { CodeApi } from "./api/codeApi";
+import { CoderApi } from "./api/coderApi";
+import { needToken } from "./api/utils";
 import { CertificateError } from "./error";
 import { getGlobalFlags } from "./globalFlags";
 import { Storage } from "./storage";
 import { escapeCommandArg, toRemoteAuthority, toSafeHost } from "./util";
 import {
 	AgentTreeItem,
-	WorkspaceTreeItem,
 	OpenableTreeItem,
+	WorkspaceTreeItem,
 } from "./workspacesProvider";
 
 export class Commands {
@@ -240,7 +240,7 @@ export class Commands {
 		token: string,
 		isAutologin: boolean,
 	): Promise<{ user: User; token: string } | null> {
-		const client = CodeApi.create(url, token, this.storage.output, () =>
+		const client = CoderApi.create(url, token, this.storage.output, () =>
 			vscode.workspace.getConfiguration(),
 		);
 		if (!needToken(vscode.workspace.getConfiguration())) {

src/commands.ts

@@ -4,8 +4,8 @@ import { getErrorMessage } from "coder/site/src/api/errors";
 import * as module from "module";
 import * as vscode from "vscode";
 import { errToStr } from "./api/api-helper";
-import { needToken } from "./api/auth";
-import { CodeApi } from "./api/codeApi";
+import { CoderApi } from "./api/coderApi";
+import { needToken } from "./api/utils";
 import { Commands } from "./commands";
 import { CertificateError, getErrorDetail } from "./error";
 import { Remote } from "./remote";
@@ -65,7 +65,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 	// the plugin to poll workspaces for the current login, as well as being used
 	// in commands that operate on the current login.
 	const url = storage.getUrl();
-	const client = CodeApi.create(
+	const client = CoderApi.create(
 		url || "",
 		await storage.getSessionToken(),
 		storage.output,

src/extension.ts

@@ -3,7 +3,7 @@ import {
 	GetInboxNotificationResponse,
 } from "coder/site/src/api/typesGenerated";
 import * as vscode from "vscode";
-import { CodeApi } from "./api/codeApi";
+import { CoderApi } from "./api/coderApi";
 import { type Storage } from "./storage";
 import { OneWayWebSocket } from "./websocket/oneWayWebSocket";
 
@@ -18,7 +18,7 @@ export class Inbox implements vscode.Disposable {
 	#disposed = false;
 	#socket: OneWayWebSocket<GetInboxNotificationResponse>;
 
-	constructor(workspace: Workspace, client: CodeApi, storage: Storage) {
+	constructor(workspace: Workspace, client: CoderApi, storage: Storage) {
 		this.#storage = storage;
 
 		const watchTemplates = [

src/inbox.ts

@@ -3,17 +3,44 @@ import prettyBytes from "pretty-bytes";
 
 const SENSITIVE_HEADERS = ["Coder-Session-Token", "Proxy-Authorization"];
 
+export function formatTime(ms: number): string {
+	if (ms < 1000) {
+		return `${ms}ms`;
+	}
+	if (ms < 60000) {
+		return `${(ms / 1000).toFixed(2)}s`;
+	}
+	if (ms < 3600000) {
+		return `${(ms / 60000).toFixed(2)}m`;
+	}
+	return `${(ms / 3600000).toFixed(2)}h`;
+}
+
 export function formatMethod(method: string | undefined): string {
 	return (method ?? "GET").toUpperCase();
 }
 
-export function formatContentLength(headers: Record<string, unknown>): string {
+/**
+ * Formats content-length for display. Returns the header value if available,
+ * otherwise estimates size by serializing the data body (prefixed with ~).
+ */
+export function formatContentLength(
+	headers: Record<string, unknown>,
+	data: unknown,
+): string {
 	const len = headers["content-length"];
 	if (len && typeof len === "string") {
 		const bytes = parseInt(len, 10);
 		return isNaN(bytes) ? "(?b)" : `(${prettyBytes(bytes)})`;
 	}
-	return "(?b)";
+
+	// Estimate from data if no header
+	if (data !== undefined && data !== null) {
+		const estimated = Buffer.byteLength(JSON.stringify(data), "utf8");
+		return `(~${prettyBytes(estimated)})`;
+	}
+
+	return `(${prettyBytes(0)})`;
 }
 
 export function formatUri(

src/logging/formatters.ts

@@ -1,25 +1,26 @@
 import type {
-	InternalAxiosRequestConfig,
-	AxiosResponse,
 	AxiosError,
+	AxiosResponse,
+	InternalAxiosRequestConfig,
 } from "axios";
 import { isAxiosError } from "axios";
 import { getErrorMessage } from "coder/site/src/api/errors";
 import { getErrorDetail } from "../error";
 import {
-	formatHeaders,
 	formatBody,
-	formatUri,
 	formatContentLength,
+	formatHeaders,
 	formatMethod,
+	formatTime,
+	formatUri,
 } from "./formatters";
 import type { Logger } from "./logger";
 import {
 	HttpClientLogLevel,
-	RequestMeta,
 	RequestConfigWithMeta,
+	RequestMeta,
 } from "./types";
-import { shortId, formatTime, createRequestId } from "./utils";
+import { createRequestId, shortId } from "./utils";
 
 export function createRequestMeta(): RequestMeta {
 	return {
@@ -40,7 +41,7 @@ export function logRequest(
 
 	const method = formatMethod(config.method);
 	const url = formatUri(config);
-	const len = formatContentLength(config.headers);
+	const len = formatContentLength(config.headers, config.data);
 
 	let msg = `→ ${shortId(requestId)} ${method} ${url} ${len}`;
 	if (logLevel >= HttpClientLogLevel.HEADERS) {
@@ -67,7 +68,7 @@ export function logResponse(
 	const method = formatMethod(response.config.method);
 	const url = formatUri(response.config);
 	const time = formatTime(Date.now() - meta.startedAt);
-	const len = formatContentLength(response.headers);
+	const len = formatContentLength(response.headers, response.data);
 
 	let msg = `← ${shortId(meta.requestId)} ${response.status} ${method} ${url} ${len} ${time}`;
 
@@ -94,22 +95,32 @@ export function logRequestError(
 		const requestId = meta?.requestId || "unknown";
 		const time = meta ? formatTime(Date.now() - meta.startedAt) : "?ms";
 
-		const msg = getErrorMessage(error, "No error message");
+		const msg = getErrorMessage(error, "");
 		const detail = getErrorDetail(error) ?? "";
 
 		if (error.response) {
-			const responseData =
-				error.response.statusText || String(error.response.data).slice(0, 100);
-			const errorInfo = [msg, detail, responseData].filter(Boolean).join(" - ");
-			logger.error(
-				`← ${shortId(requestId)} ${error.response.status} ${method} ${url} ${time} - ${errorInfo}`,
-				error,
-			);
+			const msgParts = [
+				`← ${shortId(requestId)} ${error.response.status} ${method} ${url} ${time}`,
+				msg,
+				detail,
+			];
+			if (msg.trim().length === 0 && detail.trim().length === 0) {
+				const responseData =
+					error.response.statusText ||
+					String(error.response.data).slice(0, 100) ||
+					"No error info";
+				msgParts.push(responseData);
+			}
+
+			const fullMsg = msgParts.map((str) => str.trim()).join(" - ");
+			const headers = formatHeaders(error.response.headers);
+			logger.error(`${fullMsg}\n${headers}`, error);
 		} else {
 			const reason = error.code || error.message || "Network error";
 			const errorInfo = [msg, detail, reason].filter(Boolean).join(" - ");
+			const headers = formatHeaders(config?.headers ?? {});
 			logger.error(
-				`✗ ${shortId(requestId)} ${method} ${url} ${time} - ${errorInfo}`,
+				`✗ ${shortId(requestId)} ${method} ${url} ${time} - ${errorInfo}\n${headers}`,
 				error,
 			);
 		}