feat: open an agent-defined directory by default (#57)

kylecarbs · web-flow · commit 71a0e75d0547 · 2023-02-08T15:12:06.000-06:00
diff --git a/src/commands.ts b/src/commands.ts
@@ -1,6 +1,6 @@
 import axios from "axios"
 import { getUser, getWorkspaces, updateWorkspaceVersion } from "coder/site/src/api/api"
-import { Workspace } from "coder/site/src/api/typesGenerated"
+import { Workspace, WorkspaceAgent } from "coder/site/src/api/typesGenerated"
 import * as vscode from "vscode"
 import { Remote } from "./remote"
 import { Storage } from "./storage"
@@ -104,6 +104,7 @@ export class Commands {
   public async open(...args: string[]): Promise<void> {
     let workspaceOwner: string
     let workspaceName: string
+    let folderPath: string | undefined
 
     if (args.length === 0) {
       const quickPick = vscode.window.createQuickPick()
@@ -156,9 +157,20 @@ export class Commands {
       }
       workspaceOwner = workspace.owner_name
       workspaceName = workspace.name
+
+      // TODO: multiple agent support
+      const agents = workspace.latest_build.resources.reduce((acc, resource) => {
+        return acc.concat(resource.agents || [])
+      }, [] as WorkspaceAgent[])
+
+      if (agents.length === 1) {
+        folderPath = agents[0].expanded_directory
+      }
     } else {
       workspaceOwner = args[0]
       workspaceName = args[1]
+      // workspaceAgent is reserved for args[2], but multiple agents aren't supported yet.
+      folderPath = args[3]
     }
 
     // A workspace can have multiple agents, but that's handled
@@ -171,39 +183,46 @@ export class Commands {
       newWindow = false
     }
 
-    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 === remoteAuthority,
-    )
-    if (opened.length > 0) {
-      let selected: (typeof opened)[0]
+    // If a folder isn't specified, we can try to open a recently opened folder.
+    if (!folderPath) {
+      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 === remoteAuthority,
+      )
+      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.path,
+        if (opened.length > 1) {
+          const items: vscode.QuickPickItem[] = opened.map((folder): vscode.QuickPickItem => {
+            return {
+              label: folder.folderUri.path,
+            }
+          })
+          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]
         }
-        selected = opened[items.indexOf(item)]
-      } else {
-        selected = opened[0]
+
+        folderPath = selected.folderUri.path
       }
+    }
 
+    if (folderPath) {
       await vscode.commands.executeCommand(
         "vscode.openFolder",
         vscode.Uri.from({
           scheme: "vscode-remote",
           authority: remoteAuthority,
-          path: selected.folderUri.path,
+          path: folderPath,
         }),
         // Open this in a new window!
         newWindow,
diff --git a/src/extension.ts b/src/extension.ts
@@ -30,6 +30,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
         const owner = params.get("owner")
         const workspace = params.get("workspace")
         const agent = params.get("agent")
+        const folder = params.get("folder")
         if (!owner) {
           throw new Error("owner must be specified as a query parameter")
         }
@@ -45,7 +46,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
         if (token) {
           await storage.setSessionToken(token)
         }
-        vscode.commands.executeCommand("coder.open", owner, workspace, agent)
+        vscode.commands.executeCommand("coder.open", owner, workspace, agent, folder)
       }
     },
   })
diff --git a/src/remote.ts b/src/remote.ts
@@ -1,6 +1,7 @@
 import axios from "axios"
 import {
   getBuildInfo,
+  getTemplate,
   getWorkspace,
   getWorkspaceBuildLogs,
   getWorkspaceByOwnerAndName,
@@ -134,9 +135,10 @@ export class Remote {
             buildComplete = r
           }),
       )
+      const template = await getTemplate(this.storage.workspace.template_id)
       this.storage.workspace = {
         ...this.storage.workspace,
-        latest_build: await startWorkspace(this.storage.workspace.id),
+        latest_build: await startWorkspace(this.storage.workspace.id, template.active_version_id),
       }
     }
 
diff --git a/yarn.lock b/yarn.lock
@@ -1418,7 +1418,7 @@ co@3.1.0:
 
 "coder@https://github.com/coder/coder":
   version "0.0.0"
-  resolved "https://github.com/coder/coder#8a5760a2fea074fda65d199620aaa9ed447e7c8d"
+  resolved "https://github.com/coder/coder#7a1731b6205d9c68f6308ee362ff2d62124b6950"
 
 collapse-white-space@^1.0.2:
   version "1.0.6"

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {`
`30`	`30`	`const owner = params.get("owner")`
`31`	`31`	`const workspace = params.get("workspace")`
`32`	`32`	`const agent = params.get("agent")`
	`33`	`+ const folder = params.get("folder")`
`33`	`34`	`if (!owner) {`
`34`	`35`	`throw new Error("owner must be specified as a query parameter")`
`35`	`36`	`}`
`@@ -45,7 +46,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {`
`45`	`46`	`if (token) {`
`46`	`47`	`await storage.setSessionToken(token)`
`47`	`48`	`}`
`48`		`- vscode.commands.executeCommand("coder.open", owner, workspace, agent)`
	`49`	`+ vscode.commands.executeCommand("coder.open", owner, workspace, agent, folder)`
`49`	`50`	`}`
`50`	`51`	`},`
`51`	`52`	`})`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import axios from "axios"`
`2`	`2`	`import {`
`3`	`3`	`getBuildInfo,`
	`4`	`+ getTemplate,`
`4`	`5`	`getWorkspace,`
`5`	`6`	`getWorkspaceBuildLogs,`
`6`	`7`	`getWorkspaceByOwnerAndName,`
`@@ -134,9 +135,10 @@ export class Remote {`
`134`	`135`	`buildComplete = r`
`135`	`136`	`}),`
`136`	`137`	`)`
	`138`	`+ const template = await getTemplate(this.storage.workspace.template_id)`
`137`	`139`	`this.storage.workspace = {`
`138`	`140`	`...this.storage.workspace,`
`139`		`- latest_build: await startWorkspace(this.storage.workspace.id),`
	`141`	`+ latest_build: await startWorkspace(this.storage.workspace.id, template.active_version_id),`
`140`	`142`	`}`
`141`	`143`	`}`
`142`	`144`