handle review comments

Author: EhabY

src/uri/uriHandler.ts

@@ -13,9 +13,9 @@ import type { ChatPanelProvider } from "../webviews/chat/chatPanelProvider";
 
 interface UriHandlerDeps {
 	serviceContainer: ServiceContainer;
-	deploymentManager: DeploymentManager;
-	commands: Commands;
-	chatPanelProvider: ChatPanelProvider;
+	deploymentManager: Pick<DeploymentManager, "setDeployment">;
+	commands: Pick<Commands, "open" | "openDevContainer">;
+	chatPanelProvider: Pick<ChatPanelProvider, "openChat">;
 }
 
 interface UriRouteContext extends UriHandlerDeps {
@@ -152,7 +152,7 @@ async function handleOpenDevContainer(ctx: UriRouteContext): Promise<void> {
 async function setupDeployment(
 	params: URLSearchParams,
 	serviceContainer: ServiceContainer,
-	deploymentManager: DeploymentManager,
+	deploymentManager: Pick<DeploymentManager, "setDeployment">,
 ): Promise<void> {
 	const secretsManager = serviceContainer.getSecretsManager();
 	const mementoManager = serviceContainer.getMementoManager();

src/webviews/chat/chatPanelProvider.ts

@@ -29,7 +29,7 @@ export class ChatPanelProvider
 	private authRetryTimer: ReturnType<typeof setTimeout> | undefined;
 
 	constructor(
-		private readonly client: CoderApi,
+		private readonly client: Pick<CoderApi, "getHost" | "getSessionToken">,
 		private readonly logger: Logger,
 	) {}
 

test/mocks/vscode.runtime.ts

@@ -91,10 +91,12 @@ const onDidChangeWorkspaceFolders = new EventEmitter<unknown>();
 const onDidChangeActiveColorTheme = new EventEmitter<unknown>();
 
 export const window = {
-	activeColorTheme: { kind: ColorThemeKind.Dark } as { kind: number },
+	activeColorTheme: { kind: ColorThemeKind.Dark },
 	onDidChangeActiveColorTheme: onDidChangeActiveColorTheme.event,
-	__fireDidChangeActiveColorTheme: (e: unknown) =>
-		onDidChangeActiveColorTheme.fire(e),
+	setActiveColorThemeKind: (kind: number) => {
+		window.activeColorTheme = { kind };
+		onDidChangeActiveColorTheme.fire({ kind });
+	},
 	showInformationMessage: vi.fn(),
 	showWarningMessage: vi.fn(),
 	showErrorMessage: vi.fn(),

test/unit/uri/uriHandler.test.ts

@@ -15,11 +15,8 @@ import {
 	MockContextManager,
 } from "../../mocks/testHelpers";
 
-import type { Commands } from "@/commands";
 import type { ServiceContainer } from "@/core/container";
-import type { DeploymentManager } from "@/deployment/deploymentManager";
 import type { LoginCoordinator, LoginOptions } from "@/login/loginCoordinator";
-import type { ChatPanelProvider } from "@/webviews/chat/chatPanelProvider";
 
 vi.mock("@/promptUtils", () => ({ maybeAskUrl: vi.fn() }));
 
@@ -97,14 +94,12 @@ function createTestContext() {
 		.mocked(vscode.window.showErrorMessage)
 		.mockResolvedValue(undefined);
 
-	const chatPanelProvider = {
-		openChat: vi.fn(),
-	} as unknown as ChatPanelProvider;
+	const chatPanelProvider = { openChat: vi.fn() };
 
 	registerUriHandler({
 		serviceContainer: container,
-		deploymentManager: deploymentManager as unknown as DeploymentManager,
-		commands: commands as unknown as Commands,
+		deploymentManager,
+		commands,
 		chatPanelProvider,
 	});
 

test/unit/webviews/chat/chatPanelProvider.test.ts

@@ -5,17 +5,10 @@ import { ChatPanelProvider } from "@/webviews/chat/chatPanelProvider";
 
 import { createMockLogger, MockCoderApi } from "../../../mocks/testHelpers";
 
-import type { CoderApi } from "@/api/coderApi";
-
-type WindowMock = typeof vscode.window & {
-	activeColorTheme: { kind: number };
-	__fireDidChangeActiveColorTheme: (e: unknown) => void;
+const windowMock = vscode.window as typeof vscode.window & {
+	setActiveColorThemeKind: (kind: number) => void;
 };
 
-function setMockTheme(kind: number): void {
-	(vscode.window as WindowMock).activeColorTheme = { kind };
-}
-
 interface Harness {
 	provider: ChatPanelProvider;
 	postMessage: ReturnType<typeof vi.fn>;
@@ -27,10 +20,7 @@ function createHarness(): Harness {
 	const client = new MockCoderApi();
 	client.setCredentials("https://coder.example.com", "test-token");
 
-	const provider = new ChatPanelProvider(
-		client as unknown as CoderApi,
-		createMockLogger(),
-	);
+	const provider = new ChatPanelProvider(client, createMockLogger());
 
 	let handler: ((msg: unknown) => void) | null = null;
 
@@ -89,7 +79,7 @@ function findPostedMessage(
 describe("ChatPanelProvider", () => {
 	beforeEach(() => {
 		vi.resetAllMocks();
-		setMockTheme(vscode.ColorThemeKind.Dark);
+		windowMock.setActiveColorThemeKind(vscode.ColorThemeKind.Dark);
 	});
 
 	describe("theme sync", () => {
@@ -99,7 +89,7 @@ describe("ChatPanelProvider", () => {
 			[vscode.ColorThemeKind.HighContrast, "dark"],
 			[vscode.ColorThemeKind.HighContrastLight, "light"],
 		])("maps ColorThemeKind %i to %s on chat-ready", (kind, expected) => {
-			setMockTheme(kind);
+			windowMock.setActiveColorThemeKind(kind);
 			const { sendFromWebview, postMessage } = createHarness();
 
 			sendFromWebview({ type: "coder:chat-ready" });
@@ -124,10 +114,7 @@ describe("ChatPanelProvider", () => {
 			const { postMessage } = createHarness();
 			postMessage.mockClear();
 
-			setMockTheme(vscode.ColorThemeKind.Light);
-			(vscode.window as WindowMock).__fireDidChangeActiveColorTheme({
-				kind: vscode.ColorThemeKind.Light,
-			});
+			windowMock.setActiveColorThemeKind(vscode.ColorThemeKind.Light);
 
 			expect(postMessage).toHaveBeenCalledWith({
 				type: "coder:set-theme",