@devries-cameron20 / t3code Mirror · read-only / commits / a05e8fde08
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 10:45 UTC

fix(web): Add Environment dialog reopens on Remote link instead of a stale SSH selection (#26160)

Co-authored-by: maria-rcks <maria@kuuro.net>

Igor Makowski committed Oct 31, 2026 at 02:37 UTC a05e8fde08cd1d5e5852f3b19b4c75f519fdcdd8
2 files changed +166 -16
apps/web/src/components/settings/AddEnvironmentDialog.browser.test.tsx new
+139
@@ -0,0 +1,139 @@
1 +import { Atom, AsyncResult } from "effect/reactivity";
2 +import * as Cause from "effect/Cause";
3 +import type { AtomCommandResult } from "@t3tools/client-runtime/state/runtime";
4 +import { useState } from "react";
5 +import { page, userEvent } from "vite-plus/test/browser";
6 +import { describe, expect, it, vi } from "vite-plus/test";
7 +
8 +import { render, stubGlobal } from "../../../test/render";
9 +import { AppAtomRegistryProvider } from "../../rpc/atomRegistry";
10 +
11 +const mocks = vi.hoisted(() => ({
12 + connectSshEnvironment: vi.fn<() => Promise<AtomCommandResult<void, Error>>>(async () =>
13 + AsyncResult.success(undefined),
14 + ),
15 + refresh: () => {},
16 +}));
17 +
18 +vi.mock(import("../../state/use-atom-command"), async (original) => ({
19 + ...(await original()),
20 + useAtomCommand: ((command: unknown) => command) as never,
21 +}));
22 +vi.mock(import("~/connection/onboarding"), async (original) => ({
23 + ...(await original()),
24 + connectSshEnvironment: mocks.connectSshEnvironment as never,
25 +}));
26 +vi.mock(import("~/state/query"), async (original) => ({
27 + ...(await original()),
28 + useEnvironmentQuery: (() => ({
29 + data: [],
30 + isPending: false,
31 + error: null,
32 + refresh: mocks.refresh,
33 + })) as never,
34 +}));
35 +vi.mock(import("~/state/environments"), async (original) => ({
36 + ...(await original()),
37 + useRelayEnvironmentDiscovery: (() => ({ environments: new Map() })) as never,
38 +}));
39 +vi.mock(import("~/state/server"), async (original) => ({
40 + ...(await original()),
41 + primaryServerKeybindingsAtom: Atom.make([]) as never,
42 +}));
43 +
44 +import { AddEnvironmentDialog } from "./AddEnvironmentDialog";
45 +
46 +function Owner() {
47 + const [open, setOpen] = useState(false);
48 + const [error, setError] = useState<string | null>(null);
49 + return (
50 + <AppAtomRegistryProvider>
51 + <AddEnvironmentDialog
52 + open={open}
53 + routeTarget={null}
54 + error={error}
55 + savedEnvironments={[]}
56 + onOpenChange={setOpen}
57 + onErrorChange={setError}
58 + />
59 + </AppAtomRegistryProvider>
60 + );
61 +}
62 +
63 +function setup() {
64 + mocks.connectSshEnvironment.mockClear();
65 + return stubGlobal("desktopBridge", {});
66 +}
67 +
68 +const remoteCard = () => page.getByRole("button", { name: /Remote link/ });
69 +const sshCard = () => page.getByRole("button", { name: /^SSH/ });
70 +
71 +async function openDialogOnSsh() {
72 + await userEvent.click(page.getByRole("button", { name: "Add environment" }));
73 + await userEvent.click(sshCard());
74 + await expect.element(sshCard()).toHaveAttribute("aria-pressed", "true");
75 +}
76 +
77 +async function expectDefaultModeAfterReopen() {
78 + await expect.element(page.getByRole("dialog")).not.toBeInTheDocument();
79 + await userEvent.click(page.getByRole("button", { name: "Add environment" }));
80 + await expect.element(remoteCard()).toHaveAttribute("aria-pressed", "true");
81 + await expect.element(sshCard()).toHaveAttribute("aria-pressed", "false");
82 + await expect.element(page.getByPlaceholder("backend.example.com")).toBeInTheDocument();
83 +}
84 +
85 +describe("AddEnvironmentDialog", () => {
86 + it("reopens on Remote link after adding an SSH environment", async () => {
87 + using _bridge = setup();
88 + await using _screen = await render(<Owner />);
89 +
90 + await openDialogOnSsh();
91 + await userEvent.type(page.getByPlaceholder("Search hosts or type devbox"), "devbox");
92 + await userEvent.click(
93 + page.getByRole("dialog").getByRole("button", { name: "Add environment" }),
94 + );
95 + expect(mocks.connectSshEnvironment).toHaveBeenCalledOnce();
96 +
97 + await expectDefaultModeAfterReopen();
98 + });
99 +
100 + it("clears the form after dismissing it on SSH", async () => {
101 + using _bridge = setup();
102 + await using _screen = await render(<Owner />);
103 +
104 + await openDialogOnSsh();
105 + await userEvent.click(remoteCard());
106 + await userEvent.type(page.getByPlaceholder("backend.example.com"), "devbox.example.com");
107 + await userEvent.type(page.getByPlaceholder("PAIRCODE"), "PAIRCODE");
108 + await userEvent.click(sshCard());
109 + await userEvent.type(page.getByPlaceholder("Search hosts or type devbox"), "devbox");
110 + await userEvent.type(page.getByPlaceholder("root"), "maria");
111 + await userEvent.type(page.getByPlaceholder("22"), "2222");
112 + await userEvent.keyboard("{Escape}");
113 +
114 + await expectDefaultModeAfterReopen();
115 + await expect.element(page.getByPlaceholder("backend.example.com")).toHaveValue("");
116 + await expect.element(page.getByPlaceholder("PAIRCODE")).toHaveValue("");
117 + await userEvent.click(sshCard());
118 + await expect.element(page.getByPlaceholder("Search hosts or type devbox")).toHaveValue("");
119 + await expect.element(page.getByPlaceholder("root")).toHaveValue("");
120 + await expect.element(page.getByPlaceholder("22")).toHaveValue("");
121 +
122 + let finishConnection!: (result: AtomCommandResult<void, Error>) => void;
123 + const pending = new Promise<AtomCommandResult<void, Error>>((resolve) => {
124 + finishConnection = resolve;
125 + });
126 + mocks.connectSshEnvironment.mockImplementationOnce(() => pending);
127 + await userEvent.type(page.getByPlaceholder("Search hosts or type devbox"), "devbox");
128 + await userEvent.click(
129 + page.getByRole("dialog").getByRole("button", { name: "Add environment" }),
130 + );
131 + await userEvent.keyboard("{Escape}");
132 + await expectDefaultModeAfterReopen();
133 + finishConnection(AsyncResult.failure(Cause.fail(new Error("dismissed SSH attempt"))));
134 + await expect
135 + .element(page.getByRole("dialog").getByRole("button", { name: "Add environment" }))
136 + .toBeEnabled();
137 + await expect.element(page.getByText(/dismissed SSH attempt/)).not.toBeInTheDocument();
138 + });
139 +});
apps/web/src/components/settings/AddEnvironmentDialog.tsx
+27 -16
@@ -118,6 +118,7 @@ export function AddEnvironmentDialog({
118 const [sshHostSuggestionsOpen, setSshHostSuggestionsOpen] = useState(false);
119 const highlightedSshHostRef = useRef<DesktopDiscoveredSshHost | undefined>(undefined);
120 const [isAddingSavedBackend, setIsAddingSavedBackend] = useState(false);
121 + const savedBackendSessionRef = useRef(0);
122 const isSshDiscoveryActive = desktopBridge !== undefined && open && savedBackendMode === "ssh";
123 const desktopSshHosts = useEnvironmentQuery(
124 isSshDiscoveryActive ? desktopSshHostsStateAtom : null,
@@ -146,7 +147,20 @@ export function AddEnvironmentDialog({
147 const hasSshHostSuggestionContent =
148 desktopBridge !== undefined &&
149 (isLoadingDiscoveredSshHosts || unsavedDiscoveredSshHosts.length > 0);
150 + const handleOpenChange = (nextOpen: boolean) => {
151 + if (!nextOpen) {
152 + savedBackendSessionRef.current += 1;
153 + setSavedBackendMode("remote");
154 + setSavedBackendHost("");
155 + setSavedBackendPairingCode("");
156 + setSavedBackendSshHost("");
157 + setSavedBackendSshUsername("");
158 + setSavedBackendSshPort("");
159 + }
160 + onOpenChange(nextOpen);
161 + };
162 const connectSavedBackendSshTarget = async (target: DesktopSshEnvironmentTarget) => {
163 + const session = savedBackendSessionRef.current;
164 setIsAddingSavedBackend(true);
165 onErrorChange(null);
166 const result = await connectSshEnvironment({
@@ -155,19 +169,14 @@ export function AddEnvironmentDialog({
169 ...(routeTarget ? { expectedEnvironmentId: routeTarget.environmentId } : {}),
170 });
171 if (result._tag === "Failure") {
158 - if (!isAtomCommandInterrupted(result)) {
172 + if (session === savedBackendSessionRef.current && !isAtomCommandInterrupted(result)) {
173 pipe(squashAtomCommandFailure(result), formatDesktopSshConnectionError, onErrorChange);
174 }
175 setIsAddingSavedBackend(false);
176 return;
177 }
178
165 - setSavedBackendHost("");
166 - setSavedBackendPairingCode("");
167 - setSavedBackendSshHost("");
168 - setSavedBackendSshUsername("");
169 - setSavedBackendSshPort("");
170 - onOpenChange(false);
179 + handleOpenChange(false);
180 toastManager.add({
181 type: "success",
182 title: routeTarget ? "Route added" : "Environment connected",
@@ -239,12 +248,7 @@ export function AddEnvironmentDialog({
248 return;
249 }
250
242 - setSavedBackendHost("");
243 - setSavedBackendPairingCode("");
244 - setSavedBackendSshHost("");
245 - setSavedBackendSshUsername("");
246 - setSavedBackendSshPort("");
247 - onOpenChange(false);
251 + handleOpenChange(false);
252 toastManager.add(
253 routeTarget
254 ? {
@@ -272,6 +276,7 @@ export function AddEnvironmentDialog({
276 const handleSelectSshHostSuggestion = async (target: DesktopDiscoveredSshHost) => {
277 if (isAddingSavedBackend || !desktopBridge) return;
278
279 + const session = savedBackendSessionRef.current;
280 setIsAddingSavedBackend(true);
281 onErrorChange(null);
282 setSavedBackendSshHost(target.alias);
@@ -279,7 +284,13 @@ export function AddEnvironmentDialog({
284 try {
285 resolved = await desktopBridge.resolveSshHost(target.alias);
286 } catch (error) {
282 - onErrorChange(formatDesktopSshConnectionError(error));
287 + if (session === savedBackendSessionRef.current) {
288 + onErrorChange(formatDesktopSshConnectionError(error));
289 + }
290 + setIsAddingSavedBackend(false);
291 + return;
292 + }
293 + if (session !== savedBackendSessionRef.current) {
294 setIsAddingSavedBackend(false);
295 return;
296 }
@@ -434,7 +445,7 @@ export function AddEnvironmentDialog({
445 }
446 return;
447 }
437 - onOpenChange(false);
448 + handleOpenChange(false);
449 toastManager.add({
450 type: "success",
451 title: "Route added",
@@ -595,7 +606,7 @@ export function AddEnvironmentDialog({
606 );
607
608 return (
598 - <Dialog open={open} onOpenChange={onOpenChange}>
609 + <Dialog open={open} onOpenChange={handleOpenChange}>
610 <Tooltip>
611 <TooltipTrigger
612 render={