Don't open a folder by default when launching a workspace

Fixes #20.

Author: kylecarbs

src/commands.ts

@@ -152,37 +152,47 @@ export class Commands {
 
     // A workspace can have multiple agents, but that's handled
     // when opening a workspace unless explicitly specified.
-    let uri = vscode.Uri.parse(`vscode-remote://ssh-remote+${Remote.Prefix}${workspaceOwner}--${workspaceName}/`)
+    const remoteAuthority = `ssh-remote+${Remote.Prefix}${workspaceOwner}--${workspaceName}`
 
     const output: {
       workspaces: { folderUri: vscode.Uri; remoteAuthority: string }[]
     } = await vscode.commands.executeCommand("_workbench.getRecentlyOpened")
     const opened = output.workspaces.filter(
       // Filter out `/` since that's added below.
-      (opened) => opened.folderUri?.authority === uri.authority && uri.path !== "/",
+      (opened) => opened.folderUri?.authority === remoteAuthority,
     )
-    // Always add `/` as an option to open. If we don't, it can become hard
-    // to open multiple VS Code windows.
-    opened.splice(0, 0, {
-      folderUri: uri,
-      remoteAuthority: "coder",
-    })
-    if (opened.length > 1) {
-      const items: vscode.QuickPickItem[] = opened.map((folder): vscode.QuickPickItem => {
-        return {
-          label: folder.folderUri.fsPath,
+    if (opened.length > 0) {
+      let selected: typeof opened[0]
+
+      if (opened.length > 1) {
+        const items: vscode.QuickPickItem[] = opened.map((folder): vscode.QuickPickItem => {
+          return {
+            label: folder.folderUri.fsPath,
+          }
+        })
+        const item = await vscode.window.showQuickPick(items, {
+          title: "Select a recently opened folder",
+        })
+        if (!item) {
+          return
         }
-      })
-      const item = await vscode.window.showQuickPick(items, {
-        title: "Select a recently opened folder",
-      })
-      if (!item) {
-        return
+        selected = opened[items.indexOf(item)]
+      } else {
+        selected = opened[0]
       }
-      const selected = opened[items.indexOf(item)]
-      uri = vscode.Uri.joinPath(uri, selected.folderUri.path)
+
+      await vscode.commands.executeCommand(
+        "vscode.openFolder",
+        vscode.Uri.from({
+          scheme: "vscode-remote",
+          authority: remoteAuthority,
+          path: selected.folderUri.path,
+        }),
+      )
+      return
     }
 
-    await vscode.commands.executeCommand("vscode.openFolder", uri)
+    // This opens the workspace without an active folder opened.
+    await vscode.commands.executeCommand("vscode.newWindow", { remoteAuthority: remoteAuthority, reuseWindow: true })
   }
 }

src/extension.ts

@@ -78,15 +78,9 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
   // Since the "onResolveRemoteAuthority:ssh-remote" activation event exists
   // in package.json we're able to perform actions before the authority is
   // resolved by the remote SSH extension.
-  const activeRemotes = vscode.workspace.workspaceFolders?.filter((folder) => folder.uri.scheme === "vscode-remote")
-  // If the currently opened folder isn't remote we can return early!
-  if (activeRemotes?.length !== 1) {
+  if (!vscodeProposed.env.remoteAuthority) {
     return
   }
-  const activeRemote = activeRemotes[0].uri
-
-  ctx.globalStorageUri
-
   const remote = new Remote(vscodeProposed, storage, ctx.extensionMode)
-  await remote.setup(activeRemote)
+  await remote.setup(vscodeProposed.env.remoteAuthority)
 }

src/remote.ts

@@ -32,8 +32,8 @@ export class Remote {
     private readonly mode: vscode.ExtensionMode,
   ) {}
 
-  public async setup(uri: vscode.Uri): Promise<vscode.Disposable | undefined> {
-    const authorityParts = uri.authority.split("+")
+  public async setup(remoteAuthority: string): Promise<vscode.Disposable | undefined> {
+    const authorityParts = remoteAuthority.split("+")
     // If the URI passed doesn't have the proper prefix
     // ignore it. We don't need to do anything special,
     // because this isn't trying to open a Coder workspace.
@@ -110,7 +110,7 @@ export class Remote {
             await this.closeRemote()
           }
           await vscode.commands.executeCommand("coder.login", this.storage.getURL())
-          await this.setup(uri)
+          await this.setup(remoteAuthority)
           return
         }
         default: