diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx index 0b0116be549cb..a96fc5faf5b56 100644 --- a/apps/web/src/components/ChatMarkdown.tsx +++ b/apps/web/src/components/ChatMarkdown.tsx @@ -607,7 +607,7 @@ function useChatMarkdownState({ target !== null && resolveRemoteOpenState({ target, - sshTarget: null, + routes: [], remoteOpenTargets: undefined, isDesktopRenderer: window.desktopBridge !== undefined, }).mode !== "local-exec" diff --git a/apps/web/src/remoteOpen.test.ts b/apps/web/src/remoteOpen.test.ts index 365ec4a3d50af..79fc3019222ec 100644 --- a/apps/web/src/remoteOpen.test.ts +++ b/apps/web/src/remoteOpen.test.ts @@ -1,9 +1,13 @@ import { + BearerConnectionProfile, + BearerConnectionTarget, PrimaryConnectionTarget, RelayConnectionTarget, + SshConnectionProfile, SshConnectionTarget, } from "@t3tools/client-runtime/connection"; import { buildRemoteOpenUrl, EnvironmentId } from "@t3tools/contracts"; +import * as Option from "effect/Option"; import { describe, expect, it } from "vite-plus/test"; import { resolveRemoteOpenState } from "./remoteOpen"; @@ -18,6 +22,18 @@ const primaryTarget = (httpBaseUrl: string) => wsBaseUrl: httpBaseUrl.replace("http", "ws"), }); +const sshRoute = (target: { readonly alias: string; readonly username: string | null }) => ({ + target: new SshConnectionTarget({ environmentId, label: "sol", connectionId: "ssh-1" }), + profile: Option.some( + new SshConnectionProfile({ + connectionId: "ssh-1", + environmentId, + label: "sol", + target: { ...target, hostname: "sol.tail1234.ts.net", port: null }, + }), + ), +}); + const TAILSCALE_TARGETS = [ { kind: "tailscale", host: "sol.tail1234.ts.net" }, { kind: "mdns", host: "sol.local" }, @@ -28,7 +44,7 @@ describe("resolveRemoteOpenState", () => { expect( resolveRemoteOpenState({ target: primaryTarget("http://127.0.0.1:8000"), - sshTarget: null, + routes: [], isDesktopRenderer: false, remoteOpenTargets: TAILSCALE_TARGETS, }), @@ -39,7 +55,7 @@ describe("resolveRemoteOpenState", () => { expect( resolveRemoteOpenState({ target: primaryTarget("https://sol.tail1234.ts.net"), - sshTarget: null, + routes: [], isDesktopRenderer: false, remoteOpenTargets: TAILSCALE_TARGETS, }), @@ -54,7 +70,7 @@ describe("resolveRemoteOpenState", () => { expect( resolveRemoteOpenState({ target: primaryTarget("http://172.29.112.1:14369"), - sshTarget: null, + routes: [], isDesktopRenderer: true, remoteOpenTargets: TAILSCALE_TARGETS, }), @@ -64,7 +80,7 @@ describe("resolveRemoteOpenState", () => { it("leaves a bare desktop SSH alias for the editor to resolve through SSH config", () => { const state = resolveRemoteOpenState({ target: new SshConnectionTarget({ environmentId, label: "sol", connectionId: "ssh-1" }), - sshTarget: { alias: "sol", username: null }, + routes: [sshRoute({ alias: "sol", username: null })], isDesktopRenderer: true, remoteOpenTargets: [ { kind: "tailscale", host: "sol.tail1234.ts.net", username: "server-user" }, @@ -94,7 +110,7 @@ describe("resolveRemoteOpenState", () => { ])("keeps one login username in editor links for $alias (username: '$username')", (sshTarget) => { const state = resolveRemoteOpenState({ target: new SshConnectionTarget({ environmentId, label: "server", connectionId: "ssh-1" }), - sshTarget, + routes: [sshRoute(sshTarget)], isDesktopRenderer: true, remoteOpenTargets: TAILSCALE_TARGETS, }); @@ -116,7 +132,7 @@ describe("resolveRemoteOpenState", () => { it("uses the advertised login username in editor links over a relay", () => { const state = resolveRemoteOpenState({ target: new RelayConnectionTarget({ environmentId, label: "server" }), - sshTarget: null, + routes: [], isDesktopRenderer: false, remoteOpenTargets: [ { kind: "tailscale", host: "server.tail1234.ts.net", username: "admin-user" }, @@ -134,13 +150,48 @@ describe("resolveRemoteOpenState", () => { expect( resolveRemoteOpenState({ target: new RelayConnectionTarget({ environmentId, label: "sol" }), - sshTarget: null, + routes: [], isDesktopRenderer: false, remoteOpenTargets, }), ).toEqual({ mode: "remote-unavailable" }); } }); + it("uses a saved SSH route's alias when a Tailscale route is preferred", () => { + const target = new BearerConnectionTarget({ + environmentId, + label: "sol", + connectionId: "ts-1", + }); + const state = resolveRemoteOpenState({ + target, + routes: [ + { + target, + profile: Option.some( + new BearerConnectionProfile({ + connectionId: "ts-1", + environmentId, + label: "sol", + httpBaseUrl: "https://sol.tail1234.ts.net", + wsBaseUrl: "wss://sol.tail1234.ts.net", + network: "tailscale", + }), + ), + }, + sshRoute({ alias: "sol-alias", username: null }), + ], + isDesktopRenderer: false, + remoteOpenTargets: [ + { kind: "tailscale", host: "sol.tail1234.ts.net", username: "server-user" }, + ], + }); + expect(state).toEqual({ mode: "remote-links", host: { kind: "ssh-alias", host: "sol-alias" } }); + if (state.mode !== "remote-links") throw new Error("Expected a remote link"); + expect( + buildRemoteOpenUrl({ editor: "zed", ...state.host, absolutePath: "/work/project" }), + ).toBe("zed://ssh/sol-alias/work/project"); + }); }); describe("buildRemoteOpenUrl", () => { diff --git a/apps/web/src/remoteOpen.ts b/apps/web/src/remoteOpen.ts index 741f6f3c60cde..ab56bcd476084 100644 --- a/apps/web/src/remoteOpen.ts +++ b/apps/web/src/remoteOpen.ts @@ -1,4 +1,8 @@ -import type { ConnectionTarget } from "@t3tools/client-runtime/connection"; +import { + connectionRoutes, + type ConnectionRoute, + type ConnectionTarget, +} from "@t3tools/client-runtime/connection"; import { REMOTE_CAPABLE_EDITOR_IDS, type EditorId, @@ -48,9 +52,20 @@ function parseHostname(url: string): string | null { } } +function firstSshTarget(routes: ReadonlyArray) { + for (const route of routes) { + const profile = Option.getOrNull(route.profile); + if (profile?._tag === "SshConnectionProfile" && profile.target.alias.length > 0) { + return profile.target; + } + } + return null; +} + export function resolveRemoteOpenState(input: { readonly target: ConnectionTarget | null; - readonly sshTarget: { readonly alias: string; readonly username: string | null } | null; + /** The environment's saved routes, preferred route first. */ + readonly routes: ReadonlyArray; readonly remoteOpenTargets: ReadonlyArray | undefined; readonly isDesktopRenderer: boolean; }): RemoteOpenState { @@ -71,13 +86,13 @@ export function resolveRemoteOpenState(input: { return LOCAL_EXEC; } - if (input.sshTarget !== null && input.sshTarget.alias.length > 0) { - const { alias } = input.sshTarget; + const sshTarget = firstSshTarget(input.routes); + if (sshTarget !== null) { + const { alias } = sshTarget; const userSeparator = alias.lastIndexOf("@"); const host = userSeparator === -1 ? alias : alias.slice(userSeparator + 1); const username = - input.sshTarget.username?.trim() || - (userSeparator === -1 ? null : alias.slice(0, userSeparator)); + sshTarget.username?.trim() || (userSeparator === -1 ? null : alias.slice(0, userSeparator)); return { mode: "remote-links", host: { @@ -112,12 +127,10 @@ const remoteOpenResolutionAtom = Atom.family((environmentId: EnvironmentId) => if (entry === null) { return UNRESOLVED_REMOTE_OPEN; } - const profile = Option.getOrNull(entry.profile); const next: RemoteOpenResolution = { state: resolveRemoteOpenState({ target: entry.target, - sshTarget: - profile !== null && profile._tag === "SshConnectionProfile" ? profile.target : null, + routes: connectionRoutes(entry), remoteOpenTargets: presentation?.serverConfig?.remoteOpenTargets, isDesktopRenderer: window.desktopBridge !== undefined, }),