dashinja
diff --git a/‎errors/NoWorkspaceFolder.md renamed to ‎errors/NoWorkspaceFound.md b/‎errors/NoWorkspaceFolder.md renamed to ‎errors/NoWorkspaceFound.md
diff --git a/‎package-lock.json
Lines changed: 1 addition & 1 deletion b/‎package-lock.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎package.json
Lines changed: 1 addition & 2 deletions b/‎package.json
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/channel/index.ts
Lines changed: 17 additions & 12 deletions b/‎src/channel/index.ts
Lines changed: 17 additions & 12 deletions
diff --git a/‎src/editor/index.ts
Lines changed: 0 additions & 1 deletion b/‎src/editor/index.ts
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/services/notify/index.ts
Lines changed: 0 additions & 11 deletions b/‎src/services/notify/index.ts
Lines changed: 0 additions & 11 deletions
diff --git a/‎web-app/src/services/state/machine.ts
Lines changed: 7 additions & 0 deletions b/‎web-app/src/services/state/machine.ts
Lines changed: 7 additions & 0 deletions
@@ -1,6 +1,6 @@
 {
   "name": "coderoad",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Play interactive coding tutorials in your editor",
   "keywords": [
     "tutorial",
@@ -26,7 +26,6 @@
   "scripts": {
     "build": "./scripts/build.sh",
     "postinstall": "node ./node_modules/vscode/bin/install",
-    "publish": "vsce publish -p $PERSONAL_ACCESS_TOKEN --packagePath ./releases/coderoad-$npm_package_version.vsix --baseContentUrl https://github.com/coderoad/coderoad-vscode/blob/master --baseImagesUrl https://github.com/coderoad/coderoad-vscode/blob/master",
     "lint": "eslint src/**/*ts",
     "package": "./scripts/package.sh",
     "storybook": "cd web-app && npm run storybook",
 
@@ -14,7 +14,7 @@ import { openWorkspace, checkWorkspaceEmpty } from '../services/workspace'
 import { readFile } from 'fs'
 import { join } from 'path'
 import { promisify } from 'util'
-import environment from 'environment'
+import environment from '../environment'
 
 const readFileAsync = promisify(readFile)
 
@@ -49,6 +49,22 @@ class Channel implements Channel {
 
     switch (actionType) {
       case 'EDITOR_ENV_GET':
+        // check if a workspace is open, otherwise nothing works
+        const noActiveWorksapce = !environment.WORKSPACE_ROOT.length
+        if (noActiveWorksapce) {
+          const error: E.ErrorMessage = {
+            type: 'NoWorkspaceFound',
+            message: '',
+            actions: [
+              {
+                label: 'Open Workspace',
+                transition: 'REQUEST_WORKSPACE',
+              },
+            ],
+          }
+          this.send({ type: 'NO_WORKSPACE', payload: { error } })
+          return
+        }
         this.send({
           type: 'ENV_LOAD',
           payload: {
@@ -177,17 +193,6 @@ class Channel implements Channel {
         vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload)
         return
       case 'EDITOR_VALIDATE_SETUP':
-        // check if a workspace is open
-        const noActiveWorksapce = !environment.WORKSPACE_ROOT.length
-        if (noActiveWorksapce) {
-          const error: E.ErrorMessage = {
-            type: 'NoWorkspaceFound',
-            message: '',
-          }
-          this.send({ type: 'VALIDATE_SETUP_FAILED', payload: { error } })
-          return
-        }
-
         // check workspace is selected
         const isEmptyWorkspace = await checkWorkspaceEmpty()
         if (!isEmptyWorkspace) {
 
@@ -1,5 +1,4 @@
 import * as vscode from 'vscode'
-import notify from '../services/notify'
 import { createCommands } from './commands'
 
 class Editor {
 
@@ -35,11 +35,18 @@ export const createMachine = (options: any) => {
           states: {
             Startup: {
               onEntry: ['loadEnv'],
+              onExit: ['clearError'],
               on: {
                 ENV_LOAD: {
                   target: 'LoadStoredTutorial',
                   actions: ['setEnv'],
                 },
+                NO_WORKSPACE: {
+                  actions: ['setError'],
+                },
+                REQUEST_WORKSPACE: {
+                  actions: 'requestWorkspaceSelect',
+                },
               },
             },
             LoadStoredTutorial: {
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import * as vscode from 'vscode'`
`2`		`-import notify from '../services/notify'`
`3`	`2`	`import { createCommands } from './commands'`
`4`	`3`
`5`	`4`	`class Editor {`