Mar 4, 2025 · Mar 4, 2025 · Mar 4, 2025
diff --git a/site/src/pages/TerminalPage/TerminalPage.tsx b/site/src/pages/TerminalPage/TerminalPage.tsx
 // a round-trip, and must be a UUIDv4.
 const reconnectionToken = searchParams.get("reconnect") ?? uuidv4();
 const command = searchParams.get("command") || undefined;
 const containerName = searchParams.get("container") || undefined;
 const containerUser = searchParams.get("container_user") || undefined;
 // The workspace name is in the format:
 // <workspace name>[.<agent name>]
 const workspaceNameParts = params.workspace?.split(".");
 command,
 terminal.rows,
 terminal.cols,
 containerName,
 containerUser,
 )
 .then((url) => {
 if (disposed) {
 workspace.error,
 workspace.isLoading,
 workspaceAgent,
 containerName,
 containerUser,
 ]);

 return (
diff --git a/site/src/utils/terminal.ts b/site/src/utils/terminal.ts
 command: string | undefined,
 height: number,
 width: number,
 containerName: string | undefined,
 containerUser: string | undefined,
 ): Promise<string> => {
 const query = new URLSearchParams({ reconnect });
 if (command) {
 query.set("command", command);
 }
 query.set("height", height.toString());
 query.set("width", width.toString());
 if (containerName) {
 query.set("container", containerName);
 }
 if (containerName && containerUser) {
 query.set("container_user", containerUser);
 }

 const url = new URL(baseUrl || `${location.protocol}//${location.host}`);
 url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,6 +55,8 @@ const TerminalPage: FC = () => {
		// a round-trip, and must be a UUIDv4.
		const reconnectionToken = searchParams.get("reconnect") ?? uuidv4();
		const command = searchParams.get("command") \|\| undefined;
		const containerName = searchParams.get("container") \|\| undefined;
		const containerUser = searchParams.get("container_user") \|\| undefined;
		// The workspace name is in the format:
		// <workspace name>[.<agent name>]
		const workspaceNameParts = params.workspace?.split(".");
Expand DownExpand Up		@@ -234,6 +236,8 @@ const TerminalPage: FC = () => {
		command,
		terminal.rows,
		terminal.cols,
		containerName,
		containerUser,
		)
		.then((url) => {
		if (disposed) {
Expand DownExpand Up		@@ -302,6 +306,8 @@ const TerminalPage: FC = () => {
		workspace.error,
		workspace.isLoading,
		workspaceAgent,
		containerName,
		containerUser,
		]);

		return (
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,13 +7,21 @@ export const terminalWebsocketUrl = async (
		command: string \| undefined,
		height: number,
		width: number,
		containerName: string \| undefined,
		containerUser: string \| undefined,
		): Promise<string> => {
		const query = new URLSearchParams({ reconnect });
		if (command) {
		query.set("command", command);
		}
		query.set("height", height.toString());
		query.set("width", width.toString());
		if (containerName) {
		query.set("container", containerName);
		}
		if (containerName && containerUser) {
		query.set("container_user", containerUser);
		}

		const url = new URL(baseUrl \|\| `${location.protocol}//${location.host}`);
		url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
Expand Down