Refine tour based on feedback

Add an explicit step to check for CLI updates.
This is less confusing than waiting for the CLI download
when you select a DB.

Update wording around selecting a DB.

Fix query clause highlight location.

Split query running step into two,
so the user has to click Next before the query runs.

Author: adityasharad

.tours/codeql-tutorial.tour

@@ -4,15 +4,15 @@
   "isPrimary": true,
   "steps": [
     {
-      "directory": "codeql-tutorial-database",
-      "description": "To run a CodeQL query, we first need a CodeQL database to run against.\n\nHere is a sample database we have prepared for you.\n\nTo select it, right-click on the `codeql-tutorial-database` folder in the Explorer view, and click `CodeQL: Set Current Database`."
+      "description": "First, let's make sure the CodeQL extension for VS Code is active, and has installed the latest version of the CodeQL CLI.\n\nClick `Next` to check for a CodeQL CLI update, and download it if necessary."
+    },
+    {
+      "description": "Checking for a CodeQL CLI update. Click `Next` when you see a popup notification telling you that the CLI has been updated.",
+      "commands": ["codeQL.checkForUpdatesToCLI"]
     },
     {
       "directory": "codeql-tutorial-database",
-      "description": "This step should automatically select the database, but it doesn't work yet! Keep going.",
-      "commands": [
-        "codeQL.setCurrentDatabase?[file:///Users/aditya/github/codeql-codespaces-template/codeql-tutorial-database]"
-      ]
+      "description": "To run a CodeQL query, we need to select a CodeQL database.\n\nWe have prepared a sample database for you to use in this tutorial.\nLook for the `codeql-tutorial-database` directory highlighted in the Explorer view in your left sidebar.\n\nTo select this as your current database, right-click on the directory, and click `CodeQL: Set Current Database`. Click `Next` when you have done that."
     },
     {
       "file": "tutorial-queries/tutorial.ql",
@@ -21,12 +21,26 @@
     },
     {
       "file": "tutorial-queries/tutorial.ql",
-      "description": "This line imports the tutorial library.",
+      "description": "This line imports the tutorial library, so that we can reuse the logic and data from this library in our own query.",
       "pattern": "import tutorial.*"
     },
     {
       "file": "tutorial-queries/tutorial.ql",
-      "description": "This is the query clause, which determines the output of the query.",
+      "description": "This is the query clause. It determines the output of the query.",
+      "selection": {
+        "start": {
+          "line": 7,
+          "character": 1
+        },
+        "end": {
+          "line": 8,
+          "character": 8
+        }
+      }
+    },
+    {
+      "file": "tutorial-queries/tutorial.ql",
+      "description": "It is time to run your first query!\n\nClick `Next` to run this query. The results will appear in a new `CodeQL Query Results` tab.\n\nTo run queries in future, outside this tutorial:\n\n1. Right-click within a `.ql` query file, and click `CodeQL: Run Query`\nOR\n1. Open the Command Palette with `Cmd/Ctrl+Shift+P`, start typing `CodeQL`, and click on `CodeQL: Run Query`.",
       "selection": {
         "start": {
           "line": 7,
@@ -40,7 +54,7 @@
     },
     {
       "file": "tutorial-queries/tutorial.ql",
-      "description": "Time to run your first query!\nThis query will be run automatically, and the results will open in a new tab.\n\nTo run other queries in future:\n1. Right-click within a `.ql` query file OR open the Command Palette with `Cmd/Ctrl+Shift+P`\n1. Select the command `CodeQL: Run Query`",
+      "description": "Running your first query.",
       "selection": {
         "start": {
           "line": 7,