diff --git a/dist/src/client/aureliaCLICommands.js b/dist/src/client/aureliaCLICommands.js
index 87e0fd0d..683874c0 100644
--- a/dist/src/client/aureliaCLICommands.js
+++ b/dist/src/client/aureliaCLICommands.js
@@ -13,7 +13,7 @@ const path = require('path');
 const fs = require('fs');
 class AureliaCliCommands {
     static registerCommands(outputChannel) {
-        return vscode.Disposable.from(vscode.commands.registerCommand('extension.auNew', () => this.auNew(outputChannel)), vscode.commands.registerCommand('extension.auGenerate', () => this.auGenerate(outputChannel)), vscode.commands.registerCommand('extension.auBuild', () => this.auBuild(outputChannel)), vscode.commands.registerCommand('extension.auTest', () => this.runCommand(['test'], outputChannel)), vscode.commands.registerCommand('extension.auRun', () => this.runCommand(['run'], outputChannel, 'aurelia-cli')));
+        return vscode.Disposable.from(vscode.commands.registerCommand('extension.auNew', () => this.auNew(outputChannel)), vscode.commands.registerCommand('extension.auGenerate', () => this.auGenerate(outputChannel)), vscode.commands.registerCommand('extension.auBuild', () => this.auBuild(outputChannel)), vscode.commands.registerCommand('extension.auTest', () => this.runCommand(['test'], outputChannel)), vscode.commands.registerCommand('extension.auRun', () => this.runCommand(['run'], outputChannel, 'aurelia-cli-run')), vscode.commands.registerCommand('extension.auRunWatch', () => this.runCommand(['run', '--watch'], outputChannel, 'aurelia-cli-run-watch')));
     }
     static auNew(outputChannel) {
         return __awaiter(this, void 0, void 0, function* () {
diff --git a/dist/src/client/aureliaCLICommands.js.map b/dist/src/client/aureliaCLICommands.js.map
index 9546e077..a8a6cfca 100644
--- a/dist/src/client/aureliaCLICommands.js.map
+++ b/dist/src/client/aureliaCLICommands.js.map
@@ -1 +1 @@
-{"version":3,"file":"aureliaCLICommands.js","sourceRoot":"","sources":["../../../src/client/aureliaCLICommands.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAY,MAAM,WAAM,QAAQ,CAAC,CAAA;AACjC,MAAY,EAAE,WAAM,eAAe,CAAC,CAAA;AACpC,MAAY,IAAI,WAAM,MAAM,CAAC,CAAA;AAC7B,MAAY,EAAE,WAAM,IAAI,CAAC,CAAA;AAEzB;IAEE,OAAc,gBAAgB,CAAC,aAAmC;QAChE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAC3B,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,iBAAiB,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,EACnF,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,sBAAsB,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,EAC7F,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,mBAAmB,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EACvF,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,kBAAkB,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,CAAC,EACnG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,iBAAiB,EAAE,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACtH,CAAC;IAED,OAAqB,KAAK,CAAC,aAAa;;YACtC,IAAI,WAAW,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,0CAA0C,EAAE,CAAC,CAAC;YAChH,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QACtE,CAAC;KAAA;IAED,OAAqB,UAAU,CAAC,aAAa;;YAE3C,IAAI,KAAK,GAAa,CAAC,UAAU,CAAC,CAAC;YACnC,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,aAAa,CAC1C,IAAI,CAAC,iBAAiB,EAAE,EACxB,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEjB,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,mCAAmC,IAAI,GAAG,EAAE,CAAC,CAAC;YACzG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEjB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACxC,CAAC;KAAA;IAED,OAAqB,OAAO,CAAC,aAAa;;YACxC,IAAI,KAAK,GAAa,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,8BAA8B,CAAC,CAAC;YAC1F,IAAI,KAAK,GAAG,EAAE,CAAC;YAEf,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI;gBAC1C,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC;oBACjE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,OAAO,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,6BAA6B,EAAE,CAAC;YACxF,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI;gBACpD,KAAK,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;gBAC5B,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAED,OAAe,iBAAiB;QAC9B,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI;YAC7F,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC;gBACjE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACxE,CAAC;QACH,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC;IACf,CAAC;IAED,OAAe,UAAU,CAAC,aAAmC;QAC3D,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,OAAe,UAAU,CAAC,IAAc,EAAE,aAAmC,EAAE,YAAqB;QAClG,IAAI,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;QACpC,EAAE,CAAC,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;QAAC,IAAI,CAAC,CAAC;YACN,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,OAAe,wBAAwB,CAAC,IAAc,EAAE,GAAW,EAAE,aAAmC;QAEtG,IAAI,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,YAAY,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAChE,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,IAAI,aAAa,CAAC,MAAM,CAAU,IAAI,CAAC,CAAC,CAAC;QAC5E,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,IAAI,aAAa,CAAC,MAAM,CAAU,IAAI,CAAC,CAAC,CAAC;QAE5E,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,OAAe,oBAAoB,CAAC,IAAc;QAEhD,IAAI,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAC3D,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,QAAQ,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;AACH,CAAC;AAvFD;oCAuFC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"aureliaCLICommands.js","sourceRoot":"","sources":["../../../src/client/aureliaCLICommands.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/package.json b/package.json
index bd5af552..1f76861b 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,8 @@
     "onCommand:extension.auGenerate",
     "onCommand:extension.auTest",
     "onCommand:extension.auBuild",
-    "onCommand:extension.auRun"
+    "onCommand:extension.auRun",
+    "onCommand:extension.auRunWatch"
   ],
   "main": "./dist/src/client/main",
   "contributes": {
@@ -69,7 +70,11 @@
       {
         "command": "extension.auRun",
         "title": "au run"
-      }
+      },
+      {
+        "command": "extension.auRunWatch",
+        "title": "au run --watch"
+      }      
     ],
     "themes": [
       {
diff --git a/src/client/aureliaCLICommands.ts b/src/client/aureliaCLICommands.ts
index 7427740d..dfa3e96b 100644
--- a/src/client/aureliaCLICommands.ts
+++ b/src/client/aureliaCLICommands.ts
@@ -11,7 +11,8 @@ export default class AureliaCliCommands {
       vscode.commands.registerCommand('extension.auGenerate', () => this.auGenerate(outputChannel)),
       vscode.commands.registerCommand('extension.auBuild', () => this.auBuild(outputChannel)),
       vscode.commands.registerCommand('extension.auTest', () => this.runCommand(['test'], outputChannel)),
-      vscode.commands.registerCommand('extension.auRun', () => this.runCommand(['run'], outputChannel, 'aurelia-cli')));
+      vscode.commands.registerCommand('extension.auRun', () => this.runCommand(['run'], outputChannel, 'aurelia-cli-run')),
+      vscode.commands.registerCommand('extension.auRunWatch', () => this.runCommand(['run', '--watch'], outputChannel, 'aurelia-cli-run-watch')));
   }
 
   private static async auNew(outputChannel) {