@@ -29,7 +29,7 @@ describe("resolveRemoteOpenState", () => {
2929 expect (
3030 resolveRemoteOpenState ( {
3131 target : primaryTarget ( "http://127.0.0.1:8000" ) ,
32- sshAlias : null ,
32+ sshTarget : null ,
3333 isDesktopRenderer : false ,
3434 remoteOpenTargets : TAILSCALE_TARGETS ,
3535 } ) ,
@@ -40,7 +40,7 @@ describe("resolveRemoteOpenState", () => {
4040 expect (
4141 resolveRemoteOpenState ( {
4242 target : primaryTarget ( "https://sol.tail1234.ts.net" ) ,
43- sshAlias : null ,
43+ sshTarget : null ,
4444 isDesktopRenderer : false ,
4545 remoteOpenTargets : TAILSCALE_TARGETS ,
4646 } ) ,
@@ -56,7 +56,7 @@ describe("resolveRemoteOpenState", () => {
5656 expect (
5757 resolveRemoteOpenState ( {
5858 target : primaryTarget ( "http://172.29.112.1:14369" ) ,
59- sshAlias : null ,
59+ sshTarget : null ,
6060 isDesktopRenderer : true ,
6161 remoteOpenTargets : TAILSCALE_TARGETS ,
6262 } ) ,
@@ -71,7 +71,7 @@ describe("resolveRemoteOpenState", () => {
7171 label : "WSL (Ubuntu)" ,
7272 connectionId : "local:wsl-1" ,
7373 } ) ,
74- sshAlias : null ,
74+ sshTarget : null ,
7575 isDesktopRenderer : false ,
7676 remoteOpenTargets : TAILSCALE_TARGETS ,
7777 } ) ,
@@ -86,19 +86,82 @@ describe("resolveRemoteOpenState", () => {
8686 label : "sol" ,
8787 connectionId : "ssh-1" ,
8888 } ) ,
89- sshAlias : "sol" ,
89+ sshTarget : { alias : "sol" , username : null } ,
9090 isDesktopRenderer : true ,
9191 remoteOpenTargets : TAILSCALE_TARGETS ,
9292 } ) ,
9393 ) . toEqual ( { mode : "remote-links" , host : { kind : "ssh-alias" , host : "sol" } } ) ;
9494 } ) ;
9595
96+ it ( "keeps the configured username for a desktop SSH target" , ( ) => {
97+ expect (
98+ resolveRemoteOpenState ( {
99+ target : new SshConnectionTarget ( {
100+ environmentId,
101+ label : "r2d2" ,
102+ connectionId : "ssh-1" ,
103+ } ) ,
104+ sshTarget : { alias : "r2d2" , username : "r2d2" } ,
105+ isDesktopRenderer : true ,
106+ remoteOpenTargets : TAILSCALE_TARGETS ,
107+ } ) ,
108+ ) . toEqual ( {
109+ mode : "remote-links" ,
110+ host : { kind : "ssh-alias" , host : "r2d2" , username : "r2d2" } ,
111+ } ) ;
112+ } ) ;
113+
114+ it . each ( [ null , "admin-user" ] ) (
115+ "opens an SSH target entered as user@host once (resolved username: %s)" ,
116+ ( username ) => {
117+ const state = resolveRemoteOpenState ( {
118+ target : new SshConnectionTarget ( { environmentId, label : "server" , connectionId : "ssh-1" } ) ,
119+ sshTarget :
{ alias :
"[email protected] " , username
} , 120+ isDesktopRenderer : true ,
121+ remoteOpenTargets : TAILSCALE_TARGETS ,
122+ } ) ;
123+ expect ( state . mode ) . toBe ( "remote-links" ) ;
124+ if ( state . mode !== "remote-links" ) throw new Error ( "Expected a remote link" ) ;
125+ expect (
126+ buildRemoteOpenUrl ( { editor : "vscode" , ...state . host , absolutePath : "/home/admin-user" } ) ,
127+ ) . toBe ( "vscode://vscode-remote/ssh-remote+admin-user%40192.168.1.172/home/admin-user" ) ;
128+ expect (
129+ buildRemoteOpenUrl ( { editor : "zed" , ...state . host , absolutePath : "/home/admin-user" } ) ,
130+ ) . toBe ( "zed://ssh/[email protected] /home/admin-user" ) ; 131+ expect (
132+ buildRemoteOpenUrl ( { editor : "idea" , ...state . host , absolutePath : "/home/admin-user" } ) ,
133+ ) . toBe (
134+ "jetbrains://gateway/ssh/environment?h=192.168.1.172&launchIde=true&ideHint=IU&projectHint=%2Fhome%2Fadmin-user&u=admin-user" ,
135+ ) ;
136+ } ,
137+ ) ;
138+
139+ it . each ( [
140+ new RelayConnectionTarget ( { environmentId, label : "server" } ) ,
141+ new BearerConnectionTarget ( { environmentId, label : "server" , connectionId : "lan-1" } ) ,
142+ primaryTarget ( "https://server.tail1234.ts.net" ) ,
143+ ] ) ( "keeps the advertised username for a network connection ($._tag)" , ( target ) => {
144+ expect (
145+ resolveRemoteOpenState ( {
146+ target,
147+ sshTarget : null ,
148+ isDesktopRenderer : false ,
149+ remoteOpenTargets : [
150+ { kind : "tailscale" , host : "server.tail1234.ts.net" , username : "admin-user" } ,
151+ ] ,
152+ } ) ,
153+ ) . toEqual ( {
154+ mode : "remote-links" ,
155+ host : { kind : "tailscale" , host : "server.tail1234.ts.net" , username : "admin-user" } ,
156+ } ) ;
157+ } ) ;
158+
96159 it ( "reports unavailable when a remote environment advertises no hosts" , ( ) => {
97160 for ( const remoteOpenTargets of [ [ ] , undefined ] as const ) {
98161 expect (
99162 resolveRemoteOpenState ( {
100163 target : new RelayConnectionTarget ( { environmentId, label : "sol" } ) ,
101- sshAlias : null ,
164+ sshTarget : null ,
102165 isDesktopRenderer : false ,
103166 remoteOpenTargets,
104167 } ) ,
@@ -110,7 +173,7 @@ describe("resolveRemoteOpenState", () => {
110173 expect (
111174 resolveRemoteOpenState ( {
112175 target : null ,
113- sshAlias : null ,
176+ sshTarget : null ,
114177 isDesktopRenderer : false ,
115178 remoteOpenTargets : undefined ,
116179 } ) ,
@@ -135,6 +198,33 @@ describe("buildRemoteOpenUrl", () => {
135198 ) ;
136199 } ) ;
137200
201+ it ( "includes the remote environment's login user" , ( ) => {
202+ expect (
203+ buildRemoteOpenUrl ( {
204+ editor : "vscode" ,
205+ host : "192.168.1.172" ,
206+ username : "admin-user" ,
207+ absolutePath : "/home/admin-user/project" ,
208+ } ) ,
209+ ) . toBe ( "vscode://vscode-remote/ssh-remote+admin-user%40192.168.1.172/home/admin-user/project" ) ;
210+ expect (
211+ buildRemoteOpenUrl ( {
212+ editor : "cursor" ,
213+ host : "r2d2" ,
214+ username : "r2d2" ,
215+ absolutePath : "/Users/r2d2/code" ,
216+ } ) ,
217+ ) . toBe ( "cursor://vscode-remote/ssh-remote+r2d2%40r2d2/Users/r2d2/code" ) ;
218+ expect (
219+ buildRemoteOpenUrl ( {
220+ editor : "zed" ,
221+ host : "r2d2" ,
222+ username : "r2d2" ,
223+ absolutePath : "/Users/r2d2/code" ,
224+ } ) ,
225+ ) . toBe ( "zed://ssh/r2d2@r2d2/Users/r2d2/code" ) ;
226+ } ) ;
227+
138228 it ( "roots Windows paths" , ( ) => {
139229 expect (
140230 buildRemoteOpenUrl ( { editor : "vscode" , host : "sol" , absolutePath : "C:\\Users\\theo" } ) ,
0 commit comments