coder
diff --git a/‎agent/agent_test.go
+6 b/‎agent/agent_test.go
+6
diff --git a/‎cli/open.go
+2-3 b/‎cli/open.go
+2-3
diff --git a/‎cli/testdata/coder_open_vscode_--help.golden
+7 b/‎cli/testdata/coder_open_vscode_--help.golden
+7
diff --git a/‎coderd/apidoc/docs.go
+6 b/‎coderd/apidoc/docs.go
+6
diff --git a/‎coderd/apidoc/swagger.json
+6 b/‎coderd/apidoc/swagger.json
+6
diff --git a/‎docs/api/agents.md
+3-1 b/‎docs/api/agents.md
+3-1
diff --git a/‎docs/api/schemas.md
+5-1 b/‎docs/api/schemas.md
+5-1
diff --git a/‎docs/cli/open_vscode.md
+11 b/‎docs/cli/open_vscode.md
+11
@@ -2012,6 +2012,12 @@ func setupAgent(t *testing.T, metadata agentsdk.Manifest, ptyTimeout time.Durati
 	if metadata.AgentID == uuid.Nil {
 		metadata.AgentID = uuid.New()
 	}
+	if metadata.AgentName == "" {
+		metadata.AgentName = "test-agent"
+	}
+	if metadata.WorkspaceName == "" {
+		metadata.WorkspaceName = "test-workspace"
+	}
 	coordinator := tailnet.NewCoordinator(logger)
 	t.Cleanup(func() {
 		_ = coordinator.Close()
 
@@ -42,7 +42,7 @@ func (r *RootCmd) openVSCode() *clibase.Cmd {
 	cmd := &clibase.Cmd{
 		Annotations: workspaceCommand,
 		Use:         "vscode <workspace> [<directory in workspace>]",
-		Short:       "Open a workspace in Visual Studio Code.",
+		Short:       "Open a workspace in Visual Studio Code",
 		Middleware: clibase.Chain(
 			clibase.RequireRangeArgs(1, 2),
 			r.InitClient(client),
@@ -168,9 +168,8 @@ func (r *RootCmd) openVSCode() *clibase.Cmd {
 				_, _ = fmt.Fprintf(inv.Stderr, "Opening %s in %s is not supported inside a workspace, please open the following URI on your local machine instead:\n\n", openingPath, vscodeDesktopName)
 				_, _ = fmt.Fprintf(inv.Stdout, "%s\n", u.String())
 				return nil
-			} else {
-				_, _ = fmt.Fprintf(inv.Stderr, "Opening %s in %s\n", openingPath, vscodeDesktopName)
 			}
+			_, _ = fmt.Fprintf(inv.Stderr, "Opening %s in %s\n", openingPath, vscodeDesktopName)
 
 			if !testNoOpen {
 				err = open.Run(u.String())
 
@@ -5,5 +5,12 @@ USAGE:
 
   Open a workspace in Visual Studio Code
 
+OPTIONS:
+      --generate-token bool, $CODER_OPEN_VSCODE_GENERATE_TOKEN
+          Generate an auth token and include it in the vscode:// URI. This is
+          for automagical configuration of VS Code Desktop and not needed if
+          already configured. This flag does not need to be specified when
+          running this command on a local machine unless automatic open fails.
+
 ———
 Run `coder --help` for a list of global options.