commit e8da7af81f6414866ec20658c1c2a0ae4fc350bf
author philip.zeyliger <philip.zeyliger@gmail.com> Thu Jun 12 14:24:28 2025 -0700
committer Autoformatter <bot@sketch.dev> Thu Jun 12 21:25:28 2025 +0000
tree c13fcf9d456f03706ea0470043af85b106a1b0ef
parent d2ba10c9e2ea1487262eaefbfbd6493200a9200a

fix: correct SSH connection string format for VS Code remote SSH

Co-Authored-By: sketch <hello@sketch.dev>
Change-ID: s43df80ba5e0e7cd3k

webui/src/web-components/sketch-container-status.ts

diff --git a/webui/src/web-components/sketch-container-status.ts b/webui/src/web-components/sketch-container-status.ts
index e0c19cd..4385571 100644
--- a/webui/src/web-components/sketch-container-status.ts
+++ b/webui/src/web-components/sketch-container-status.ts
@@ -553,6 +553,19 @@
     );
   }
 
+  getSSHConnectionString() {
+    // Return the connection string for VS Code remote SSH
+    const connectionString =
+      this.state?.ssh_connection_string || `sketch-${this.state?.session_id}`;
+    // If the connection string already contains user@, use it as-is
+    // Otherwise prepend root@ for VS Code remote SSH
+    if (connectionString.includes("@")) {
+      return connectionString;
+    } else {
+      return `root@${connectionString}`;
+    }
+  }
+
   // Format GitHub repository URL to org/repo format
   formatGitHubRepo(url) {
     if (!url) return null;
@@ -603,9 +616,10 @@
     }
 
     const sshHost = this.getSSHHostname();
-    const sshCommand = `ssh ${sshHost}`;
-    const vscodeCommand = `code --remote ssh-remote+root@${sshHost} /app -n`;
-    const vscodeURL = `vscode://vscode-remote/ssh-remote+root@${sshHost}/app?windowId=_blank`;
+    const sshConnectionString = this.getSSHConnectionString();
+    const sshCommand = `ssh ${sshConnectionString}`;
+    const vscodeCommand = `code --remote ssh-remote+${sshConnectionString} /app -n`;
+    const vscodeURL = `vscode://vscode-remote/ssh-remote+${sshConnectionString}/app?windowId=_blank`;
 
     if (!this.state?.ssh_available) {
       return html`