fix: open chat directly when workspace is already open via deeplink

When a deeplink with chatId targets an already-open workspace, VS Code
refocuses without reloading so activate() never consumes the pending
chatId. Call openChat directly after commands.open() as a fallback.

Also refactors registerUriHandler to accept a single deps object and
simplifies chatPanelProvider tests.

Author: EhabY

src/extension.ts

@@ -238,7 +238,12 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 	);
 
 	ctx.subscriptions.push(
-		registerUriHandler(serviceContainer, deploymentManager, commands),
+		registerUriHandler({
+			serviceContainer,
+			deploymentManager,
+			commands,
+			chatPanelProvider,
+		}),
 		vscode.commands.registerCommand(
 			"coder.login",
 			commands.login.bind(commands),

src/uri/uriHandler.ts

@@ -1,19 +1,25 @@
 import * as vscode from "vscode";
 
 import { errToStr } from "../api/api-helper";
-import { type Commands } from "../commands";
-import { type ServiceContainer } from "../core/container";
-import { type DeploymentManager } from "../deployment/deploymentManager";
 import { CALLBACK_PATH } from "../oauth/utils";
 import { maybeAskUrl } from "../promptUtils";
 import { toSafeHost } from "../util";
 import { vscodeProposed } from "../vscodeProposed";
 
-interface UriRouteContext {
-	params: URLSearchParams;
+import type { Commands } from "../commands";
+import type { ServiceContainer } from "../core/container";
+import type { DeploymentManager } from "../deployment/deploymentManager";
+import type { ChatPanelProvider } from "../webviews/chat/chatPanelProvider";
+
+interface UriHandlerDeps {
 	serviceContainer: ServiceContainer;
 	deploymentManager: DeploymentManager;
 	commands: Commands;
+	chatPanelProvider: ChatPanelProvider;
+}
+
+interface UriRouteContext extends UriHandlerDeps {
+	params: URLSearchParams;
 }
 
 type UriRouteHandler = (ctx: UriRouteContext) => Promise<void>;
@@ -27,17 +33,20 @@ const routes: Readonly<Record<string, UriRouteHandler>> = {
 /**
  * Registers the URI handler for `{vscode.env.uriScheme}://coder.coder-remote`... URIs.
  */
-export function registerUriHandler(
-	serviceContainer: ServiceContainer,
-	deploymentManager: DeploymentManager,
-	commands: Commands,
-): vscode.Disposable {
-	const output = serviceContainer.getLogger();
+export function registerUriHandler(deps: UriHandlerDeps): vscode.Disposable {
+	const output = deps.serviceContainer.getLogger();
 
 	return vscode.window.registerUriHandler({
 		handleUri: async (uri) => {
 			try {
-				await routeUri(uri, serviceContainer, deploymentManager, commands);
+				const handler = routes[uri.path];
+				if (!handler) {
+					throw new Error(`Unknown path ${uri.path}`);
+				}
+				await handler({
+					...deps,
+					params: new URLSearchParams(uri.query),
+				});
 			} catch (error) {
 				const message = errToStr(error, "No error message was provided");
 				output.warn(`Failed to handle URI ${uri.toString()}: ${message}`);
@@ -51,25 +60,6 @@ export function registerUriHandler(
 	});
 }
 
-async function routeUri(
-	uri: vscode.Uri,
-	serviceContainer: ServiceContainer,
-	deploymentManager: DeploymentManager,
-	commands: Commands,
-): Promise<void> {
-	const handler = routes[uri.path];
-	if (!handler) {
-		throw new Error(`Unknown path ${uri.path}`);
-	}
-
-	await handler({
-		params: new URLSearchParams(uri.query),
-		serviceContainer,
-		deploymentManager,
-		commands,
-	});
-}
-
 function getRequiredParam(params: URLSearchParams, name: string): string {
 	const value = params.get(name);
 	if (!value) {
@@ -116,6 +106,13 @@ async function handleOpen(ctx: UriRouteContext): Promise<void> {
 			await mementoManager.clearPendingChatId();
 		}
 	}
+
+	// When the workspace is already open VS Code refocuses without
+	// reloading, so activate() won't consume the pending chatId.
+	if (opened && chatId) {
+		serviceContainer.getContextManager().set("coder.agentsEnabled", true);
+		ctx.chatPanelProvider.openChat(chatId);
+	}
 }
 
 async function handleOpenDevContainer(ctx: UriRouteContext): Promise<void> {

test/unit/uri/uriHandler.test.ts

@@ -12,12 +12,14 @@ import {
 	createMockUser,
 	InMemoryMemento,
 	InMemorySecretStorage,
+	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() }));
 
@@ -77,6 +79,7 @@ function createTestContext() {
 		getSecretsManager: () => secretsManager,
 		getMementoManager: () => mementoManager,
 		getLoginCoordinator: () => loginCoordinator as unknown as LoginCoordinator,
+		getContextManager: () => new MockContextManager(),
 		getLogger: () => logger,
 	} as unknown as ServiceContainer;
 
@@ -94,11 +97,16 @@ function createTestContext() {
 		.mocked(vscode.window.showErrorMessage)
 		.mockResolvedValue(undefined);
 
-	registerUriHandler(
-		container,
-		deploymentManager as unknown as DeploymentManager,
-		commands as unknown as Commands,
-	);
+	const chatPanelProvider = {
+		openChat: vi.fn(),
+	} as unknown as ChatPanelProvider;
+
+	registerUriHandler({
+		serviceContainer: container,
+		deploymentManager: deploymentManager as unknown as DeploymentManager,
+		commands: commands as unknown as Commands,
+		chatPanelProvider,
+	});
 
 	return {
 		commands,
@@ -107,6 +115,7 @@ function createTestContext() {
 		secretsManager,
 		logger,
 		showErrorMessage,
+		chatPanelProvider,
 		handleUri: registeredHandler!,
 	};
 }
@@ -150,6 +159,25 @@ describe("uriHandler", () => {
 				expected,
 			);
 		});
+
+		it("opens chat when chatId is present and open succeeds", async () => {
+			const { handleUri, commands, chatPanelProvider } = createTestContext();
+			commands.open.mockResolvedValue(true);
+			const query = `owner=o&workspace=w&chatId=chat-123&url=${encodeURIComponent(TEST_URL)}`;
+			await handleUri(createMockUri("/open", query));
+			expect(chatPanelProvider.openChat).toHaveBeenCalledWith("chat-123");
+		});
+
+		it.each([
+			["no chatId", "owner=o&workspace=w", true],
+			["open returns false", "owner=o&workspace=w&chatId=chat-123", false],
+		])("does not open chat when %s", async (_label, params, openResult) => {
+			const { handleUri, commands, chatPanelProvider } = createTestContext();
+			commands.open.mockResolvedValue(openResult);
+			const query = `${params}&url=${encodeURIComponent(TEST_URL)}`;
+			await handleUri(createMockUri("/open", query));
+			expect(chatPanelProvider.openChat).not.toHaveBeenCalled();
+		});
 	});
 
 	describe("/openDevContainer", () => {