diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2506014c71..669e566005 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,14 +1,41 @@
 {
   "version": "0.2.0",
   "configurations": [
+    {
+      "type": "chrome",
+      "request": "attach",
+      "name": "Attach to Chrome",
+      "port": 9222,
+      "webRoot": "${workspaceFolder}"
+    },
+    {
+      "name": "LSP Server",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${workspaceFolder}/Composer/packages/tools/language-servers/language-generation/demo/src/server.ts"
+      ],
+      "runtimeArgs": [
+        "--nolazy",
+        "-r",
+        "${workspaceFolder}/Composer/node_modules/ts-node/register"
+      ],
+      "sourceMaps": true,
+      "cwd": "${workspaceFolder}/Composer/packages/tools/language-servers/language-generation/demo/src",
+      "protocol": "inspector",
+    },
     {
       "type": "node",
       "request": "launch",
       "name": "Server: Launch",
-      "args": ["./build/server.js"],
+      "args": [
+        "./build/server.js"
+      ],
       "preLaunchTask": "server: build",
       "restart": true,
-      "outFiles": ["./build/*"],
+      "outFiles": [
+        "./build/*"
+      ],
       "envFile": "${workspaceFolder}/Composer/packages/server/.env",
       "outputCapture": "std",
       "cwd": "${workspaceFolder}/Composer/packages/server"
@@ -20,8 +47,14 @@
       "name": "Jest Debug",
       "program": "${workspaceRoot}/Composer/node_modules/jest/bin/jest",
       "stopOnEntry": false,
-      "args": ["--runInBand", "--env=jsdom", "--config=jest.config.js"],
-      "runtimeArgs": ["--inspect-brk"],
+      "args": [
+        "--runInBand",
+        "--env=jsdom",
+        "--config=jest.config.js"
+      ],
+      "runtimeArgs": [
+        "--inspect-brk"
+      ],
       "cwd": "${workspaceRoot}/Composer/packages/server",
       "sourceMaps": true,
       "console": "integratedTerminal"
diff --git a/Composer/cypress/integration/Breadcrumb.spec.ts b/Composer/cypress/integration/Breadcrumb.spec.ts
index 8c647ee409..63adecd879 100644
--- a/Composer/cypress/integration/Breadcrumb.spec.ts
+++ b/Composer/cypress/integration/Breadcrumb.spec.ts
@@ -13,7 +13,8 @@ context('breadcrumb', () => {
   });
 
   function hasBreadcrumbItems(cy: Cypress.cy, items: (string | RegExp)[]) {
-    cy.findByTestId('Breadcrumb')
+    cy.get('[data-testid="Breadcrumb"]')
+      .last()
       .get('li')
       .should($li => {
         items.forEach((item, idx) => {
@@ -37,21 +38,21 @@ context('breadcrumb', () => {
       cy.findByText('__TestTodoSample.Main').click();
     });
 
-    hasBreadcrumbItems(cy, ['__TestTodoSample']);
+    hasBreadcrumbItems(cy, ['__TestTodoSample.Main']);
   });
 
   it('can show event name in breadcrumb', () => {
     cy.findByTestId('ProjectTree').within(() => {
       cy.findByText('AddToDo').click();
-      cy.findByText('Dialog started (BeginDialog)').click();
+      cy.findByText('Dialog started').click();
     });
 
-    hasBreadcrumbItems(cy, ['AddToDo', 'Dialog started (BeginDialog)']);
+    hasBreadcrumbItems(cy, ['AddToDo', 'Dialog started']);
   });
 
   it('can show action name in breadcrumb', () => {
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('Greeting (ConversationUpdate)').click();
+      cy.findByText('Greeting').click();
     });
 
     // Click on an action
@@ -61,6 +62,6 @@ context('breadcrumb', () => {
       });
     });
 
-    hasBreadcrumbItems(cy, ['__TestTodoSample.Main', 'Greeting (ConversationUpdate)', 'Send a response']);
+    hasBreadcrumbItems(cy, ['__TestTodoSample.Main', 'Greeting', 'Send a response']);
   });
 });
diff --git a/Composer/cypress/integration/CreateNewBot.spec.ts b/Composer/cypress/integration/CreateNewBot.spec.ts
index a02d28cc9a..4841f3cde7 100644
--- a/Composer/cypress/integration/CreateNewBot.spec.ts
+++ b/Composer/cypress/integration/CreateNewBot.spec.ts
@@ -23,9 +23,9 @@ context('Creating a new bot', () => {
     cy.findByTestId('Create from template').click();
     cy.findByTestId('TodoSample').click();
     cy.findByTestId('NextStepButton').click();
-    cy.findByTestId('NewDialogName').type('{selectall}__TestNewProject{enter}');
+    cy.findByTestId('NewDialogName').type('{selectall}__TestNewProject2{enter}');
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('__TestNewProject.Main').should('exist');
+      cy.findByText('__TestNewProject2.Main').should('exist');
       cy.findByText('AddToDo').should('exist');
       cy.findByText('ClearToDos').should('exist');
       cy.findByText('DeleteToDo').should('exist');
diff --git a/Composer/cypress/integration/NotificationPage.spec.ts b/Composer/cypress/integration/NotificationPage.spec.ts
index 7a3d9fe657..0f98c58149 100644
--- a/Composer/cypress/integration/NotificationPage.spec.ts
+++ b/Composer/cypress/integration/NotificationPage.spec.ts
@@ -5,6 +5,7 @@ context('Notification Page', () => {
   beforeEach(() => {
     cy.visit(Cypress.env('COMPOSER_URL'));
     cy.createBot('TodoSample');
+    cy.visitPage('Notifications');
   });
 
   it('can show lg syntax error ', () => {
diff --git a/Composer/cypress/integration/VisualDesigner.spec.ts b/Composer/cypress/integration/VisualDesigner.spec.ts
index 7ecdabfaa2..eb6ee33041 100644
--- a/Composer/cypress/integration/VisualDesigner.spec.ts
+++ b/Composer/cypress/integration/VisualDesigner.spec.ts
@@ -2,12 +2,9 @@
 // Licensed under the MIT License.
 
 context('Visual Designer', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit(Cypress.env('COMPOSER_URL'));
     cy.createBot('TodoSample');
-  });
-
-  beforeEach(() => {
     // Return to Main.dialog
     cy.findByTestId('ProjectTree').within(() => {
       cy.findByText('__TestTodoSample.Main').click();
@@ -16,11 +13,11 @@ context('Visual Designer', () => {
 
   it('can find Visual Designer default trigger in container', () => {
     cy.findByTestId('ProjectTree').within(() => {
-      cy.findByText('Greeting (ConversationUpdate)').click();
+      cy.findByText('Greeting').click();
     });
 
     cy.withinEditor('VisualEditor', () => {
-      cy.findByText('Trigger').should('exist');
+      cy.findByText('ConversationUpdate activity').should('exist');
     });
   });
 });
diff --git a/Composer/cypress/support/commands.ts b/Composer/cypress/support/commands.ts
index de5939e41f..60b0e246d9 100644
--- a/Composer/cypress/support/commands.ts
+++ b/Composer/cypress/support/commands.ts
@@ -23,4 +23,10 @@ Cypress.Commands.add('withinEditor', (editorName, cb) => {
 
 Cypress.Commands.add('visitPage', page => {
   cy.findByTestId(`LeftNav-CommandBarButton${page}`).click();
+  cy.wait(3000);
+});
+
+Cypress.on('uncaught:exception', (err, runnable) => {
+  console.log('uncaught exception', err);
+  return false;
 });
diff --git a/Composer/jest.config.js b/Composer/jest.config.js
index 32b10b6b50..da2165fe69 100644
--- a/Composer/jest.config.js
+++ b/Composer/jest.config.js
@@ -41,5 +41,6 @@ module.exports = {
     '<rootDir>/packages/extensions/visual-designer',
     '<rootDir>/packages/lib/code-editor',
     '<rootDir>/packages/lib/shared',
+    '<rootDir>/packages/tools/language-servers/language-generation',
   ],
 };
diff --git a/Composer/package.json b/Composer/package.json
index 742387b7b8..52a879a14e 100644
--- a/Composer/package.json
+++ b/Composer/package.json
@@ -13,16 +13,20 @@
     "packages/extensions",
     "packages/extensions/*",
     "packages/lib",
-    "packages/lib/*"
+    "packages/lib/*",
+    "packages/tools",
+    "packages/tools/language-servers",
+    "packages/tools/language-servers/*"
   ],
   "scripts": {
     "build": "node scripts/begin.js && yarn build:prod",
-    "build:prod": "yarn build:lib && yarn build:extensions && yarn build:server && yarn build:client",
-    "build:dev": "yarn build:lib && yarn build:extensions",
+    "build:prod": "yarn build:dev && yarn build:server && yarn build:client",
+    "build:dev": "yarn build:tools && yarn build:lib && yarn build:extensions",
     "build:lib": "yarn workspace @bfc/libs build:all",
     "build:extensions": "yarn workspace @bfc/extensions build:all",
     "build:server": "yarn workspace @bfc/server build",
     "build:client": "yarn workspace @bfc/client build",
+    "build:tools": "yarn workspace @bfc/tools build:all",
     "start": "cross-env NODE_ENV=production PORT=3000 yarn start:server",
     "startall": "concurrently --kill-others-on-fail \"npm:runtime\" \"npm:start\"",
     "start:dev": "concurrently  \"npm:start:client\" \"npm:start:server:dev\"",
@@ -34,7 +38,7 @@
     "test:coverage": "yarn test --coverage --no-cache --reporters=default",
     "test:integration": "cypress run --browser chrome",
     "test:integration:open": "cypress open",
-    "test:integration:clean": "rimraf TestBots/*",
+    "test:integration:clean": "rimraf ../MyBots/__Test*",
     "lint": "wsrun --exclude-missing --collect-logs --report lint",
     "lint:fix": "wsrun --exclude-missing --collect-logs --report lint:fix",
     "typecheck": "concurrently --kill-others-on-fail \"npm:typecheck:*\"",
diff --git a/Composer/packages/client/config/webpack.config.js b/Composer/packages/client/config/webpack.config.js
index 0a98e430f2..f56da750fe 100644
--- a/Composer/packages/client/config/webpack.config.js
+++ b/Composer/packages/client/config/webpack.config.js
@@ -228,6 +228,10 @@ module.exports = function(webpackEnv) {
       // `web` extension prefixes have been added for better support
       // for React Native Web.
       extensions: paths.moduleFileExtensions.map(ext => `.${ext}`),
+      alias: {
+        // Support lsp code editor
+        vscode: require.resolve('monaco-languageclient/lib/vscode-compatibility'),
+      },
       plugins: [
         // Adds support for installing with Plug'n'Play, leading to faster installs and adding
         // guards against forgotten dependencies and such.
@@ -402,7 +406,7 @@ module.exports = function(webpackEnv) {
     plugins: [
       new MonacoWebpackPlugin({
         // available options are documented at https://github.com/Microsoft/monaco-editor-webpack-plugin#options
-        languages: ['markdown', 'botbuilderlg', 'json'],
+        languages: ['markdown', 'json'],
       }),
       // Generates an `index.html` file with the <script> injected.
       new HtmlWebpackPlugin(
diff --git a/Composer/packages/client/jest.config.js b/Composer/packages/client/jest.config.js
index 7b7eb814eb..f3dba4c9c3 100644
--- a/Composer/packages/client/jest.config.js
+++ b/Composer/packages/client/jest.config.js
@@ -10,6 +10,8 @@ module.exports = {
     // Any imports of .scss / .css files will instead import styleMock.js which is an empty object
     '\\.(jpg|jpeg|png|svg|gif)$': '<rootDir>/__tests__/jestMocks/styleMock.js',
     '\\.(s)?css$': '<rootDir>/__tests__/jestMocks/styleMock.js',
+    // lsp code editor
+    vscode$: 'monaco-languageclient/lib/vscode-compatibility',
 
     // use commonjs modules for test so they do not need to be compiled
     'office-ui-fabric-react/lib/(.*)$': 'office-ui-fabric-react/lib-commonjs/$1',
diff --git a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
index 6a6988b3cc..71c9075202 100644
--- a/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/TriggerCreationModal.tsx
@@ -180,7 +180,7 @@ export const TriggerCreationModal: React.FC<TriggerCreationModalProps> = props =
           )}
           {showIntentDropDown && (
             <Dropdown
-              label={formatMessage('Which intent do you want to handle?')}
+              label={formatMessage('Which intent do you want to handle? (Optional)')}
               options={intentOptions}
               styles={dropdownStyles}
               onChange={onSelectIntent}
diff --git a/Composer/packages/client/src/pages/language-generation/code-editor.tsx b/Composer/packages/client/src/pages/language-generation/code-editor.tsx
index 247e26a2a7..2808d5a30c 100644
--- a/Composer/packages/client/src/pages/language-generation/code-editor.tsx
+++ b/Composer/packages/client/src/pages/language-generation/code-editor.tsx
@@ -2,45 +2,108 @@
 // Licensed under the MIT License.
 
 /* eslint-disable react/display-name */
-import React, { useState, useEffect } from 'react';
-import { LgEditor } from '@bfc/code-editor';
+import React, { useState, useEffect, useMemo, useContext } from 'react';
+import { LgEditor, LGOption } from '@bfc/code-editor';
 import get from 'lodash/get';
 import debounce from 'lodash/debounce';
 import isEmpty from 'lodash/isEmpty';
-import { CodeRange, LgFile } from '@bfc/shared';
+import { Diagnostic } from 'botbuilder-lg';
+import { LgFile } from '@bfc/shared';
 
+import { StoreContext } from '../../store';
 import * as lgUtil from '../../utils/lgUtil';
 
 interface CodeEditorProps {
   file: LgFile;
-  onChange: (value: string) => void;
-  codeRange?: Partial<CodeRange> | null;
+  template: lgUtil.Template | null;
 }
 
+// lsp server port should be same with composer/server port.
+const lspServerPort = process.env.NODE_ENV === 'production' ? process.env.PORT || 3000 : 5000;
+const lspServerPath = '/lg-language-server';
+
 export default function CodeEditor(props: CodeEditorProps) {
-  const { file, codeRange } = props;
-  const onChange = debounce(props.onChange, 500);
+  const { actions } = useContext(StoreContext);
+  const { file, template } = props;
   const [diagnostics, setDiagnostics] = useState(get(file, 'diagnostics', []));
-  const [content, setContent] = useState(get(file, 'content', ''));
-
+  const [content, setContent] = useState('');
+  const [errorMsg, setErrorMsg] = useState('');
   const fileId = file && file.id;
+  const inlineMode = !!template;
   useEffect(() => {
     // reset content with file.content's initial state
     if (isEmpty(file)) return;
-    setContent(file.content);
-  }, [fileId]);
+    const value = template ? get(template, 'Body', '') : get(file, 'content', '');
+    setContent(value);
+  }, [fileId, template]);
+
+  useEffect(() => {
+    const isInvalid = !lgUtil.isValid(diagnostics);
+    const text = isInvalid ? lgUtil.combineMessage(diagnostics) : '';
+    setErrorMsg(text);
+  }, [diagnostics]);
+
+  const updateLgTemplate = useMemo(
+    () =>
+      debounce((body: string) => {
+        const templateName = get(template, 'Name');
+        if (!templateName) return;
+        const payload = {
+          file,
+          templateName,
+          template: {
+            Name: templateName,
+            Parameters: get(template, 'Parameters'),
+            Body: body,
+          },
+        };
+        actions.updateLgTemplate(payload);
+      }, 500),
+    [file, template]
+  );
+
+  const updateLgFile = useMemo(
+    () =>
+      debounce((content: string) => {
+        const payload = {
+          id: file.id,
+          content,
+        };
+        actions.updateLgFile(payload);
+      }, 500),
+    [file]
+  );
 
-  // local content maybe invalid and should always sync real-time
-  // file.content assume to be load from server
   const _onChange = value => {
     setContent(value);
-    onChange(value);
-    const diagnostics = lgUtil.check(value);
+
+    let diagnostics: Diagnostic[] = [];
+    if (inlineMode) {
+      const content = get(file, 'content', '');
+      const templateName = get(template, 'Name', '');
+      try {
+        const newContent = lgUtil.updateTemplate(content, templateName, {
+          Name: templateName,
+          Parameters: get(template, 'Parameters'),
+          Body: value,
+        });
+        diagnostics = lgUtil.check(newContent);
+        updateLgTemplate(value);
+      } catch (error) {
+        setErrorMsg(error.message);
+      }
+    } else {
+      diagnostics = lgUtil.check(value);
+      updateLgFile(value);
+    }
     setDiagnostics(diagnostics);
   };
 
-  const isInvalid = !lgUtil.isValid(diagnostics);
-  const errorMsg = isInvalid ? lgUtil.combineMessage(diagnostics) : '';
+  const lgOption: LGOption = {
+    inline: inlineMode,
+    content: get(file, 'content', ''),
+    template: template ? template : undefined,
+  };
 
   return (
     <LgEditor
@@ -53,9 +116,14 @@ export default function CodeEditor(props: CodeEditorProps) {
         lineDecorationsWidth: undefined,
         lineNumbersMinChars: false,
       }}
-      codeRange={codeRange || -1}
-      errorMsg={errorMsg}
+      hidePlaceholder={inlineMode}
       value={content}
+      errorMsg={errorMsg}
+      lgOption={lgOption}
+      languageServer={{
+        port: Number(lspServerPort),
+        path: lspServerPath,
+      }}
       onChange={_onChange}
     />
   );
diff --git a/Composer/packages/client/src/pages/language-generation/index.tsx b/Composer/packages/client/src/pages/language-generation/index.tsx
index 65fc47e74f..c76e1adcaa 100644
--- a/Composer/packages/client/src/pages/language-generation/index.tsx
+++ b/Composer/packages/client/src/pages/language-generation/index.tsx
@@ -7,12 +7,11 @@ import React, { useContext, Fragment, useEffect, useState, useMemo, Suspense } f
 import formatMessage from 'format-message';
 import { Toggle } from 'office-ui-fabric-react/lib/Toggle';
 import { Nav, INavLinkGroup, INavLink } from 'office-ui-fabric-react/lib/Nav';
-import get from 'lodash/get';
+import { LGTemplate } from 'botbuilder-lg';
 import { RouteComponentProps } from '@reach/router';
-import { CodeRange } from '@bfc/shared';
+import get from 'lodash/get';
 
 import { LoadingSpinner } from '../../components/LoadingSpinner';
-import { OpenAlertModal, DialogStyle } from '../../components/Modal';
 import { StoreContext } from '../../store';
 import {
   ContentHeaderStyle,
@@ -33,11 +32,11 @@ import { TestController } from './../../TestController';
 const CodeEditor = React.lazy(() => import('./code-editor'));
 
 const LGPage: React.FC<RouteComponentProps> = props => {
-  const { state, actions } = useContext(StoreContext);
+  const { state } = useContext(StoreContext);
   const { lgFiles, dialogs } = state;
   const [editMode, setEditMode] = useState(false);
   const [fileValid, setFileValid] = useState(true);
-  const [codeRange, setCodeRange] = useState<CodeRange | null>(null);
+  const [inlineTemplate, setInlineTemplate] = useState<null | lgUtil.Template>(null);
 
   const subPath = props['*'];
   const isRoot = subPath === '';
@@ -121,34 +120,16 @@ const LGPage: React.FC<RouteComponentProps> = props => {
 
   function onToggleEditMode() {
     setEditMode(!editMode);
-    setCodeRange(null);
-  }
-
-  async function onChange(newContent) {
-    if (!lgFile) {
-      return;
-    }
-
-    const payload = {
-      id: lgFile.id,
-      content: newContent,
-    };
-
-    try {
-      await actions.updateLgFile(payload);
-    } catch (error) {
-      OpenAlertModal('Save Failed', error.message, {
-        style: DialogStyle.Console,
-      });
-    }
+    setInlineTemplate(null);
   }
 
   // #TODO: get line number from lg parser, then deep link to code editor this
   // Line
-  function onTableViewClickEdit(template) {
-    setCodeRange({
-      startLineNumber: get(template, 'ParseTree._start._line', 0),
-      endLineNumber: get(template, 'ParseTree._stop._line', 0),
+  function onTableViewClickEdit(template: LGTemplate) {
+    setInlineTemplate({
+      Name: get(template, 'Name', ''),
+      Parameters: get(template, 'Parameters'),
+      Body: get(template, 'Body', ''),
     });
     navigateTo(`/language-generation`);
     setEditMode(true);
@@ -174,7 +155,7 @@ const LGPage: React.FC<RouteComponentProps> = props => {
             onText={formatMessage('Edit mode')}
             offText={formatMessage('Edit mode')}
             checked={editMode}
-            disabled={(!isRoot && editMode === false) || (codeRange === null && fileValid === false)}
+            disabled={(!isRoot && editMode === false) || (fileValid === false && editMode === true)}
             onChange={onToggleEditMode}
           />
         </div>
@@ -215,7 +196,7 @@ const LGPage: React.FC<RouteComponentProps> = props => {
           <div css={contentEditor}>
             {editMode ? (
               <Suspense fallback={<LoadingSpinner />}>
-                <CodeEditor file={lgFile} codeRange={codeRange} onChange={onChange} />
+                <CodeEditor file={lgFile} template={inlineTemplate} />
               </Suspense>
             ) : (
               <TableView file={lgFile} activeDialog={activeDialog} onClickEdit={onTableViewClickEdit} />
diff --git a/Composer/packages/client/src/utils/dialogUtil.ts b/Composer/packages/client/src/utils/dialogUtil.ts
index 99d0eaad8b..5fb27a7898 100644
--- a/Composer/packages/client/src/utils/dialogUtil.ts
+++ b/Composer/packages/client/src/utils/dialogUtil.ts
@@ -128,7 +128,11 @@ export function getEventTypes(): IDropdownOption[] {
       const labelOverrides = ConceptLabels[t];
 
       if (labelOverrides && labelOverrides.title) {
-        name = labelOverrides.title;
+        if (labelOverrides.subtitle) {
+          name = `${labelOverrides.title} (${labelOverrides.subtitle})`;
+        } else {
+          name = labelOverrides.title;
+        }
       }
 
       return { key: t, text: name || t };
@@ -144,7 +148,11 @@ export function getActivityTypes(): IDropdownOption[] {
       const labelOverrides = ConceptLabels[t];
 
       if (labelOverrides && labelOverrides.title) {
-        name = labelOverrides.title;
+        if (labelOverrides.subtitle) {
+          name = `${labelOverrides.title} (${labelOverrides.subtitle})`;
+        } else {
+          name = labelOverrides.title;
+        }
       }
 
       return { key: t, text: name || t };
diff --git a/Composer/packages/client/src/utils/lgUtil.ts b/Composer/packages/client/src/utils/lgUtil.ts
index 482a3f408e..6f3e47618d 100644
--- a/Composer/packages/client/src/utils/lgUtil.ts
+++ b/Composer/packages/client/src/utils/lgUtil.ts
@@ -14,9 +14,9 @@ const lgStaticChecker = new StaticChecker();
 
 const lgImportResolver = ImportResolver.fileResolver;
 
-interface Template {
+export interface Template {
   Name: string;
-  Parameters: string[];
+  Parameters?: string[];
   Body: string;
 }
 
@@ -69,7 +69,11 @@ export function increaseNameUtilNotExist(templates: LGTemplate[], name: string):
   return newName;
 }
 
-export function updateTemplate(content: string, templateName: string, { Name, Parameters, Body }: Template): string {
+export function updateTemplate(
+  content: string,
+  templateName: string,
+  { Name, Parameters = [], Body }: Template
+): string {
   const resource = LGParser.parse(content);
   // add if not exist
   if (resource.Templates.findIndex(t => t.Name === templateName) === -1) {
@@ -80,7 +84,7 @@ export function updateTemplate(content: string, templateName: string, { Name, Pa
 }
 
 // if Name exist, throw error.
-export function addTemplate(content: string, { Name, Parameters, Body }: Template): string {
+export function addTemplate(content: string, { Name, Parameters = [], Body }: Template): string {
   const resource = LGParser.parse(content);
   return resource.addTemplate(Name, Parameters, Body).toString();
 }
diff --git a/Composer/packages/extensions/obiformeditor/demo/webpack.config.demo.js b/Composer/packages/extensions/obiformeditor/demo/webpack.config.demo.js
index 154368ad05..c8c2bfbf43 100644
--- a/Composer/packages/extensions/obiformeditor/demo/webpack.config.demo.js
+++ b/Composer/packages/extensions/obiformeditor/demo/webpack.config.demo.js
@@ -94,6 +94,9 @@ module.exports = {
   resolve: {
     extensions: ['.tsx', '.ts', '.js'],
     plugins: [new TsconfigPathsPlugin({ configFile: path.resolve(__dirname, './tsconfig.json') })],
+    alias: {
+      vscode: require.resolve('monaco-languageclient/lib/vscode-compatibility'),
+    },
   },
 
   output: {
diff --git a/Composer/packages/extensions/obiformeditor/jest.config.js b/Composer/packages/extensions/obiformeditor/jest.config.js
index 8880037547..d134021d7c 100644
--- a/Composer/packages/extensions/obiformeditor/jest.config.js
+++ b/Composer/packages/extensions/obiformeditor/jest.config.js
@@ -5,6 +5,7 @@ module.exports = {
   moduleNameMapper: {
     // Any imports of .scss / .css files will instead import styleMock.js which is an empty object
     '\\.(s)?css$': '<rootDir>/__tests__/jestMocks/styleMock.ts',
+    vscode$: 'monaco-languageclient/lib/vscode-compatibility',
   },
   testPathIgnorePatterns: ['/node_modules/', '/jestMocks/', '__tests__/setup.ts'],
   // Some node modules are packaged and distributed in a non-transpiled form
diff --git a/Composer/packages/extensions/obiformeditor/package.json b/Composer/packages/extensions/obiformeditor/package.json
index 153a8d5a54..3a3df5e23e 100644
--- a/Composer/packages/extensions/obiformeditor/package.json
+++ b/Composer/packages/extensions/obiformeditor/package.json
@@ -31,6 +31,7 @@
     "@bfc/shared": "*",
     "@bfcomposer/react-jsonschema-form": "1.6.5",
     "@emotion/core": "^10.0.17",
+    "@types/vscode": "^1.40.0",
     "@uifabric/fluent-theme": "7.1.4",
     "@uifabric/styling": "7.7.1",
     "classnames": "^2.2.6",
diff --git a/Composer/packages/extensions/obiformeditor/src/Form/fields/RootField.tsx b/Composer/packages/extensions/obiformeditor/src/Form/fields/RootField.tsx
index 65e9cd7a08..1fe33d4299 100644
--- a/Composer/packages/extensions/obiformeditor/src/Form/fields/RootField.tsx
+++ b/Composer/packages/extensions/obiformeditor/src/Form/fields/RootField.tsx
@@ -52,6 +52,10 @@ export const RootField: React.FC<RootFieldProps> = props => {
     return designerName || dialogName || sdkOverrides.title || title || schema.title || startCase(name);
   };
 
+  const getSubTitle = (): string => {
+    return sdkOverrides.subtitle || sdkOverrides.title || formData.$type;
+  };
+
   const getDescription = (): string => {
     return sdkOverrides.description || description || schema.description || '';
   };
@@ -65,6 +69,7 @@ export const RootField: React.FC<RootFieldProps> = props => {
           styleOverrides={{ field: { fontWeight: FontWeights.semibold } }}
           fontSize={FontSizes.size20}
         />
+        <p className="RootFieldSubtitle">{getSubTitle()}</p>
         {sdkOverrides.description !== false && (description || schema.description) && (
           <p className={classnames('RootFieldDescription', FontClassNames.smallPlus)}>
             {getDescription()}
diff --git a/Composer/packages/extensions/obiformeditor/src/Form/fields/styles.css b/Composer/packages/extensions/obiformeditor/src/Form/fields/styles.css
index a73d8e3d8c..67b5509d34 100644
--- a/Composer/packages/extensions/obiformeditor/src/Form/fields/styles.css
+++ b/Composer/packages/extensions/obiformeditor/src/Form/fields/styles.css
@@ -13,7 +13,15 @@
 .RootFieldTitle {
   border-bottom: 1px solid #c8c6c4;
   padding: 0 18px;
-  margin-bottom: 16px;
+  margin-bottom: 0px;
+}
+.RootFieldSubtitle {
+  height: 15px;
+  line-height: 15px;
+  font-size: 12px;
+  font-weight: 600;
+  color: #4F4F4F;
+  margin: -7px 0 7px;
 }
 .RootFieldDescription {
   margin-top: 0;
diff --git a/Composer/packages/extensions/obiformeditor/src/Form/widgets/LgEditorWidget.tsx b/Composer/packages/extensions/obiformeditor/src/Form/widgets/LgEditorWidget.tsx
index 0c12e8e9fc..923aaa5905 100644
--- a/Composer/packages/extensions/obiformeditor/src/Form/widgets/LgEditorWidget.tsx
+++ b/Composer/packages/extensions/obiformeditor/src/Form/widgets/LgEditorWidget.tsx
@@ -1,13 +1,16 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import React, { useState, useMemo, useLayoutEffect } from 'react';
+import React, { useState, useMemo } from 'react';
 import { LgEditor } from '@bfc/code-editor';
+import get from 'lodash/get';
 import debounce from 'lodash/debounce';
-import * as monacoEditor from '@bfcomposer/monaco-editor/esm/vs/editor/editor.api';
 
 import { FormContext } from '../types';
 
+const lspServerPort = process.env.NODE_ENV === 'production' ? process.env.PORT || 3000 : 5000;
+const lspServerPath = '/lg-language-server';
+
 const LG_HELP =
   'https://github.com/microsoft/BotBuilder-Samples/blob/master/experimental/language-generation/docs/lg-file-format.md';
 
@@ -34,10 +37,9 @@ interface LgEditorWidgetProps {
 export const LgEditorWidget: React.FC<LgEditorWidgetProps> = props => {
   const { formContext, name, value, height = 250 } = props;
   const [errorMsg, setErrorMsg] = useState('');
-  const [editor, setEditor] = useState<monacoEditor.editor.IStandaloneCodeEditor>();
   const lgId = `bfd${name}-${formContext.dialogId}`;
   const lgFileId = formContext.currentDialog.lgFile || 'common';
-  const lgFile = formContext.lgFiles.find(file => file.id === lgFileId);
+  const lgFile = formContext.lgFiles && formContext.lgFiles.find(file => file.id === lgFileId);
 
   const updateLgTemplate = useMemo(
     () =>
@@ -57,45 +59,17 @@ export const LgEditorWidget: React.FC<LgEditorWidgetProps> = props => {
     })) || {
     Name: lgId,
     Body: getInitialTemplate(name, value),
-    Parameters: [],
-    Range: {
-      startLineNumber: 1,
-      endLineNumber: 1,
-    },
   };
 
-  const [localContent, setLocalContent] = useState(template.Body);
-  const templateContent = `# ${template.Name}\n${localContent}`;
-
-  // only do this once
-  const allContent = useMemo(() => {
-    if (!lgFile || !lgFile.templates) {
-      return '';
-    }
-
-    return lgFile.templates.reduce((content, t) => {
-      if (t.Name === lgId) {
-        return content;
-      }
-
-      const params = t.Parameters.length ? `(${t.Parameters.join(', ')})` : '';
-
-      content += `# ${t.Name} ${params}\n-\n`;
-      return content;
-    }, '');
-  }, []);
-  const lineCount = useMemo(() => {
-    return allContent.split('\n').length;
-  }, [allContent]);
-  // template body code range
-  const codeRange = {
-    startLineNumber: lineCount + 2,
-    endLineNumber: lineCount + template.Body.split('\n').length + 1,
+  const [localValue, setLocalValue] = useState(template.Body);
+  const lgOption = {
+    inline: true,
+    content: get(lgFile, 'content', ''),
+    template,
   };
 
-  const onChange = (newTemplate: string) => {
-    const [, body] = newTemplate.split(`# ${lgId}\n`);
-
+  const onChange = (body: string) => {
+    setLocalValue(body);
     if (formContext.dialogId) {
       if (body) {
         updateLgTemplate(body);
@@ -106,77 +80,21 @@ export const LgEditorWidget: React.FC<LgEditorWidgetProps> = props => {
         props.onChange();
       }
     }
-    setLocalContent(body);
-  };
-
-  // useLayoutEffect so that the handler can be updated before the next render
-  useLayoutEffect(() => {
-    if (editor) {
-      const keyDownHandler = editor.onKeyDown(e => {
-        const { startLineNumber, endLineNumber, startColumn, endColumn, positionLineNumber, positionColumn } =
-          editor.getSelection() || {};
-        const isRangeSelected = endLineNumber !== startLineNumber || startColumn !== endColumn;
-
-        switch (e.keyCode) {
-          case monacoEditor.KeyCode.Backspace:
-            if (
-              !localContent ||
-              (!isRangeSelected && positionLineNumber === codeRange.startLineNumber && positionColumn === 1)
-            ) {
-              e.preventDefault();
-              e.stopPropagation();
-            }
-
-            break;
-          case monacoEditor.KeyCode.Delete: {
-            const lines = localContent.split('\n');
-            // cursor would be on the column after the last character
-            const lastColumn = lines[lines.length - 1].length + 1;
-            if (
-              !localContent ||
-              (!isRangeSelected && positionLineNumber === codeRange.startLineNumber && positionColumn === lastColumn)
-            ) {
-              e.preventDefault();
-              e.stopPropagation();
-            }
-
-            break;
-          }
-          case monacoEditor.KeyCode.KEY_A:
-            if (e.ctrlKey || e.metaKey) {
-              editor.setSelection({
-                ...codeRange,
-                startColumn: 1,
-                endColumn: Infinity,
-              });
-              e.preventDefault();
-              e.stopPropagation();
-            }
-            break;
-          default:
-            return;
-        }
-      });
-
-      return () => {
-        keyDownHandler.dispose();
-      };
-    }
-  }, [editor, localContent, codeRange]);
-
-  const handleEditorMount = (editor: monacoEditor.editor.IStandaloneCodeEditor) => {
-    setEditor(editor);
   };
 
   return (
     <LgEditor
-      codeRange={codeRange}
-      errorMsg={errorMsg}
-      value={`${allContent}\n${templateContent}`}
       onChange={onChange}
+      value={localValue}
+      lgOption={lgOption}
+      errorMsg={errorMsg}
+      hidePlaceholder={true}
       helpURL={LG_HELP}
+      languageServer={{
+        port: Number(lspServerPort),
+        path: lspServerPath,
+      }}
       height={height}
-      editorDidMount={handleEditorMount}
     />
   );
 };
diff --git a/Composer/packages/extensions/visual-designer/src/components/nodes/Trigger.tsx b/Composer/packages/extensions/visual-designer/src/components/nodes/Trigger.tsx
index 4827126ce7..82435f8dbd 100644
--- a/Composer/packages/extensions/visual-designer/src/components/nodes/Trigger.tsx
+++ b/Composer/packages/extensions/visual-designer/src/components/nodes/Trigger.tsx
@@ -5,42 +5,44 @@
 
 import { ConceptLabels } from '@bfc/shared';
 import { jsx } from '@emotion/core';
+import { Icon } from 'office-ui-fabric-react/lib/Icon';
+import get from 'lodash/get';
 
-import { ElementIcon } from '../../utils/obiPropertyResolver';
-import { TriggerSize } from '../../constants/ElementSizes';
-
-import { FormCard } from './templates/FormCard';
+import {
+  triggerContainerStyle,
+  triggerContentStyle,
+  titleStyle,
+  subtitleStyle,
+  triggerIconStyle,
+} from './triggerStyles';
 
 function getLabel(data: any): string {
-  if (data.intent) {
-    return data.intent;
-  }
-
   const labelOverrides = ConceptLabels[data.$type];
-
-  if (labelOverrides.title) {
-    return labelOverrides.title;
+  if (labelOverrides) {
+    return labelOverrides.subtitle || labelOverrides.title;
   }
-
   return data.$type;
 }
 
-export const Trigger = ({ data, onClick = () => {} }): JSX.Element => (
-  <div
-    css={{
-      ...TriggerSize,
-    }}
-  >
-    <FormCard
-      nodeColors={{
-        themeColor: '#BFEAE9',
-        iconColor: 'black',
-      }}
-      icon={ElementIcon.Flow}
-      iconSize={8}
-      header={'Trigger'}
-      label={getLabel(data)}
-      onClick={onClick}
-    />
-  </div>
-);
+function getName(data: any): string {
+  return (
+    data.intent || get(data, '$designer.name', ConceptLabels[data.$type] ? ConceptLabels[data.$type].title : data.$type)
+  );
+}
+
+export const Trigger = ({ data, onClick = () => {} }): JSX.Element => {
+  const name = getName(data);
+  const label = getLabel(data);
+
+  return (
+    <div css={triggerContainerStyle}>
+      <div css={triggerContentStyle}>
+        <div css={titleStyle}>
+          <Icon iconName="Flow" style={triggerIconStyle} />
+          <span>{name}</span>
+        </div>
+        <div css={subtitleStyle}>{label}</div>
+      </div>
+    </div>
+  );
+};
diff --git a/Composer/packages/extensions/visual-designer/src/components/nodes/triggerStyles.ts b/Composer/packages/extensions/visual-designer/src/components/nodes/triggerStyles.ts
new file mode 100644
index 0000000000..fb85ba5f65
--- /dev/null
+++ b/Composer/packages/extensions/visual-designer/src/components/nodes/triggerStyles.ts
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License
+
+import { TriggerSize } from '../../constants/ElementSizes';
+
+export const triggerContainerStyle: any = {
+  ...TriggerSize,
+  display: 'flex',
+  flexDirection: 'row',
+  justifyContent: 'center',
+  alignItems: 'flex-end',
+  paddingBottom: '5px',
+  boxSizing: 'border-box',
+};
+
+export const triggerContentStyle: any = {
+  wordBreak: 'break-all',
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+};
+
+export const titleStyle: any = {
+  whiteSpace: 'nowrap',
+  color: '#333333',
+  fontFamily: 'Segoe UI',
+  fontSize: '18px',
+  lineHeight: '24px',
+  fontWeight: 600,
+};
+
+export const subtitleStyle: any = {
+  whiteSpace: 'nowrap',
+  color: '#4f4f4f',
+  fontFamily: 'Segoe UI',
+  fontSize: '12px',
+  lineHeight: '14px',
+};
+
+export const triggerIconStyle = {
+  lineHeight: '24px',
+  marginRight: '5px',
+};
diff --git a/Composer/packages/lib/code-editor/demo/.eslintrc.js b/Composer/packages/lib/code-editor/demo/.eslintrc.js
new file mode 100644
index 0000000000..76a2148af6
--- /dev/null
+++ b/Composer/packages/lib/code-editor/demo/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['../../../../.eslintrc.react.js'],
+  parserOptions: {
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
+};
diff --git a/Composer/packages/lib/code-editor/demo/index.html b/Composer/packages/lib/code-editor/demo/index.html
index b5d8461190..7258ae05a9 100644
--- a/Composer/packages/lib/code-editor/demo/index.html
+++ b/Composer/packages/lib/code-editor/demo/index.html
@@ -1,18 +1,26 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title><%= htmlWebpackPlugin.options.title %></title>
 
-    <style>
-      body {
-        margin: 10px;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="demo"></div>
-  </body>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta http-equiv="x-ua-compatible" content="ie=edge">
+  <title><%= htmlWebpackPlugin.options.title %></title>
+
+  <style>
+    body {
+      margin: 10px;
+    }
+
+    #demo {
+      height: 500px;
+    }
+  </style>
+  </style>
+</head>
+
+<body>
+  <div id="demo"></div>
+</body>
+
 </html>
diff --git a/Composer/packages/lib/code-editor/demo/src/index.tsx b/Composer/packages/lib/code-editor/demo/src/index.tsx
index d0f38df239..2be749e1f3 100644
--- a/Composer/packages/lib/code-editor/demo/src/index.tsx
+++ b/Composer/packages/lib/code-editor/demo/src/index.tsx
@@ -1,6 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import App from './App';
+import App from './lgEditor';
+// import App from './jsonEditor';
+// import App from './luEditor';
+// import App from './lgJsonEditor';
+// import App from './inlineEditor';
+// import App from './multiEditors';
+// import App from './richEditor';
 
 ReactDOM.render(<App />, document.getElementById('demo'));
diff --git a/Composer/packages/lib/code-editor/demo/src/inlineEditor.tsx b/Composer/packages/lib/code-editor/demo/src/inlineEditor.tsx
new file mode 100644
index 0000000000..485bfa3844
--- /dev/null
+++ b/Composer/packages/lib/code-editor/demo/src/inlineEditor.tsx
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import React, { useState } from 'react';
+
+import { LgEditor } from '../../src';
+
+const content = `# Greeting1
+-Good morning
+
+# Greeting2
+-Good afternoon
+
+# Greeting3
+-Good evening
+`;
+
+// Body will fill in editor
+const template = {
+  Name: 'Greeting2',
+  Body: `-Good afternoon
+-[Greeting3]
+-[Greeting4]`,
+};
+
+const lgOption = {
+  inline: true,
+  content,
+  template,
+};
+
+export default function App() {
+  const [value, setValue] = useState(template.Body);
+
+  const onChange = value => {
+    setValue(value);
+  };
+
+  const props = {
+    value,
+    onChange,
+    lgOption,
+    languageServer: {
+      port: 5000,
+      path: '/lg-language-server',
+    },
+  };
+  return <LgEditor {...props} />;
+}
diff --git a/Composer/packages/lib/code-editor/demo/src/jsonEditor.tsx b/Composer/packages/lib/code-editor/demo/src/jsonEditor.tsx
new file mode 100644
index 0000000000..f70921c358
--- /dev/null
+++ b/Composer/packages/lib/code-editor/demo/src/jsonEditor.tsx
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import React, { useState } from 'react';
+
+import { JsonEditor } from '../../src';
+
+const content = {
+  'ComposerDialogs/AddToDo/AddToDo.lu': {
+    lastUpdateTime: 1,
+    lastPublishTime: 0,
+  },
+  'ComposerDialogs/ClearToDos/ClearToDos.lu': {
+    lastUpdateTime: 1,
+    lastPublishTime: 0,
+  },
+  'ComposerDialogs/DeleteToDo/DeleteToDo.lu': {
+    lastUpdateTime: 1,
+    lastPublishTime: 0,
+  },
+  'ComposerDialogs/Main/Main.lu': {
+    lastUpdateTime: 1573624458300,
+    lastPublishTime: 0,
+  },
+  'ComposerDialogs/ShowToDos/ShowToDos.lu': {
+    lastUpdateTime: 1,
+    lastPublishTime: 0,
+  },
+};
+
+export default function App() {
+  const [value, setValue] = useState(content);
+
+  const onChange = value => {
+    setValue(value);
+  };
+
+  const props = {
+    value,
+    onChange,
+  };
+  return <JsonEditor {...props} />;
+}
diff --git a/Composer/packages/lib/code-editor/demo/src/lgEditor.tsx b/Composer/packages/lib/code-editor/demo/src/lgEditor.tsx
new file mode 100644
index 0000000000..24a8986e02
--- /dev/null
+++ b/Composer/packages/lib/code-editor/demo/src/lgEditor.tsx
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import React, { useState } from 'react';
+
+import { LgEditor } from '../../src';
+
+const content = `# Hello
+-[Welcome(time)] {name}
+
+# Welcome(time)
+-IF:{time == 'morning'}
+  - Good morning
+-ELSEIF:{time == 'evening'}
+  - Good evening
+-ELSE:
+  - How are you doing,
+
+# Exit
+-Thanks for using todo bot.
+
+# Greeting
+-What's up bro
+
+# ShowTodo
+-IF:{count(user.todos) > 0}
+-\`\`\`
+{HelperFunction()}
+@{join(foreach(user.todos, x, showSingleTodo(x)), '\n')}
+\`\`\`
+-ELSE:
+-You don't have any todos.
+
+# showSingleTodo(x)
+-* {x}
+
+# HelperFunction
+- IF: {count(user.todos) == 1}
+  - Your most recent @{count(user.todos)} task is
+- ELSE:
+  - Your most recent @{count(user.todos)} tasks are
+
+# help
+-I can add a todo, show todos, remove a todo, and clear all todos
+-I can help you yes I can
+-Help, we don't need no stinkin' help!
+
+# bfdactivity-116673
+-Successfully added a todo named {dialog.todo}
+
+# bfdactivity-832307
+-Successfully cleared items in the Todo List.
+
+# bfdactivity-983761
+-You don't have any items in the Todo List.
+
+# bfdactivity-725469
+-Successfully removed a todo named {dialog.todo}
+
+# bfdactivity-549615
+-{dialog.todo} is not in the Todo List
+
+# bfdactivity-339580
+-You have no todos.
+
+# bfdactivity-662084
+-[ShowTodo]
+
+# bfdactivity-696707
+-[help]
+
+# bfdactivity-157674
+- Hi! I'm a ToDo bot. Say "add a todo named first" to get started.
+`;
+
+export default function App() {
+  const [value, setValue] = useState(content);
+
+  const onChange = value => {
+    setValue(value);
+  };
+
+  const props = {
+    value,
+    onChange,
+    languageServer: 'localhost:5000/lg-language-server',
+  };
+  return <LgEditor {...props} />;
+}
diff --git a/Composer/packages/lib/code-editor/demo/src/lgJsonEditor.tsx b/Composer/packages/lib/code-editor/demo/src/lgJsonEditor.tsx
new file mode 100644
index 0000000000..14141ca050
--- /dev/null
+++ b/Composer/packages/lib/code-editor/demo/src/lgJsonEditor.tsx
@@ -0,0 +1,124 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import React, { useState, Fragment } from 'react';
+
+import { LgEditor } from '../../src';
+import { JsonEditor } from '../../src';
+
+const jsonContent = {
+  'ComposerDialogs/AddToDo/AddToDo.lu': {
+    lastUpdateTime: 1,
+    lastPublishTime: 0,
+  },
+  'ComposerDialogs/ClearToDos/ClearToDos.lu': {
+    lastUpdateTime: 1,
+    lastPublishTime: 0,
+  },
+  'ComposerDialogs/DeleteToDo/DeleteToDo.lu': {
+    lastUpdateTime: 1,
+    lastPublishTime: 0,
+  },
+  'ComposerDialogs/Main/Main.lu': {
+    lastUpdateTime: 1573624458300,
+    lastPublishTime: 0,
+  },
+  'ComposerDialogs/ShowToDos/ShowToDos.lu': {
+    lastUpdateTime: 1,
+    lastPublishTime: 0,
+  },
+};
+
+const lgContent = `# Hello
+-[Welcome(time)] {name}
+
+# Welcome(time)
+-IF:{time == 'morning'}
+  - Good morning
+-ELSEIF:{time == 'evening'}
+  - Good evening
+-ELSE:
+  - How are you doing,
+
+# Exit
+-Thanks for using todo bot.
+
+# Greeting
+-What's up bro
+
+# ShowTodo
+-IF:{count(user.todos) > 0}
+-\`\`\`
+{HelperFunction()}
+@{join(foreach(user.todos, x, showSingleTodo(x)), '\n')}
+\`\`\`
+-ELSE:
+-You don't have any todos.
+
+# showSingleTodo(x)
+-* {x}
+
+# HelperFunction
+- IF: {count(user.todos) == 1}
+  - Your most recent @{count(user.todos)} task is
+- ELSE:
+  - Your most recent @{count(user.todos)} tasks are
+
+# help
+-I can add a todo, show todos, remove a todo, and clear all todos
+-I can help you yes I can
+-Help, we don't need no stinkin' help!
+
+# bfdactivity-116673
+-Successfully added a todo named {dialog.todo}
+
+# bfdactivity-832307
+-Successfully cleared items in the Todo List.
+
+# bfdactivity-983761
+-You don't have any items in the Todo List.
+
+# bfdactivity-725469
+-Successfully removed a todo named {dialog.todo}
+
+# bfdactivity-549615
+-{dialog.todo} is not in the Todo List
+
+# bfdactivity-339580
+-You have no todos.
+
+# bfdactivity-662084
+-[ShowTodo]
+
+# bfdactivity-696707
+-[help]
+
+# bfdactivity-157674
+- Hi! I'm a ToDo bot. Say "add a todo named first" to get started.
+`;
+
+export default function App() {
+  const [value1, setValue1] = useState(lgContent);
+  const [value2, setValue2] = useState(jsonContent);
+
+  const props1 = {
+    value: value1,
+    onChange: value => {
+      setValue1(value);
+    },
+    languageServer: 'localhost:5000/lg-language-server',
+  };
+
+  const props2 = {
+    value: value2,
+    onChange: value => {
+      setValue2(value);
+    },
+  };
+  return (
+    <Fragment>
+      <LgEditor {...props1} />
+      <JsonEditor {...props2} />
+    </Fragment>
+  );
+}
diff --git a/Composer/packages/lib/code-editor/demo/src/luEditor.tsx b/Composer/packages/lib/code-editor/demo/src/luEditor.tsx
new file mode 100644
index 0000000000..4b333bc10b
--- /dev/null
+++ b/Composer/packages/lib/code-editor/demo/src/luEditor.tsx
@@ -0,0 +1,229 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import React, { useState } from 'react';
+
+import { LuEditor } from '../../src';
+
+const content = `> Entity definitions
+$ itemTitle : simple
+
+> Add a Phrase List with todo variations. Mark them as interchangeable.
+$ todoItem : PhraseList interchangeable
+   - todo
+   - todos
+   - to dos
+   - todo list
+   - todos list
+   - item list
+   - items collection
+   - collection
+   - list
+
+> Add a list entity to detect list tye
+$ listType : todo =
+- to do
+- todos
+- laundry
+
+$ listType : shopping =
+- shopping
+- shop
+- shoppers
+
+$ listType : grocery =
+- groceries
+- fruits
+- vegetables
+- household items
+- house hold items
+
+> Help intent and related utterances.
+# Help
+- What can I say?
+- Who are you?
+- I need help
+- Not sure what I can do
+- What do you want me to say?
+- What can you do?
+- What can you help with?
+- help please
+- What are my options?
+- well, I do not know what my todo's title is
+- I do not know
+- can you please help?
+
+> Greeting intent and related utterances
+# Greeting
+- hi
+- hello
+- hiya
+- how are you?
+- how do you do?
+
+> Cancel intent and related utterances
+# Cancel
+- cancel
+- cancel all
+- stop that
+- do not do it
+- abort
+- please stop what you are doing
+- I changed my mind
+- cancel add todo
+- cancel that
+- I do not want to add a todo
+- No todo for me
+- Cancel this
+- cancel delete todo
+- Let's just leave it as is
+- I do not wish to delete my todo anymore
+- Keep my todos as is
+- No todo for me
+
+> Add item
+# AddItem
+- Add todo
+- add a to do item
+- Please remind me to {itemTitle=buy milk}
+- Please remember that I need to {itemTitle=buy milk}
+- I need you to remember that {itemTitle=my wife's birthday is Jan 9th}
+- Add a todo named {itemTitle=send report over this weekend}
+- Add {itemTitle=get a new car} to the todo list
+- Add {itemTitle=write a spec} to the list
+- Add {itemTitle=finish this demo} to my todo list
+- add a todo item {itemTitle=vacuuming by october 3rd}
+- add {itemTitle=call my mother} to my todo list
+- add {itemTitle=due date august to peanut butter jelly bread milk} on todos list
+- add {itemTitle=go running} to my todos
+- add to my todos list {itemTitle=mail the insurance forms out by saturday}
+- can i add {itemTitle=shirts} on the todos list
+- could i add {itemTitle=medicine} to the todos list
+- would you add {itemTitle=heavy cream} to the todos list
+- add {itemTitle} to my todo list
+- add a to do that {itemTitle=purchase a nice sweater}
+- add a to do to {itemTitle=buy shoes}
+- add an task of {itemTitle=chores to do around the house}
+- add {itemTitle=go to whole foods} in my to do list
+- add {itemTitle=reading} to my to do list
+- add this thing in to do list
+- add to my to do list {itemTitle=pick up clothes}
+- add to my to do list {itemTitle=print papers for 10 copies this afternoon}
+- create to do
+- create to do that {itemTitle=read a book tonight}
+- create to do to {itemTitle=go running in the park}
+- put {itemTitle=hikes} on my to do list
+- remind me to {itemTitle = pick up dry cleaning}
+- new to do
+- add another one
+- add
+> Add patterns
+- Please remember [to] {itemTitle}
+- I need you to remember [that] {itemTitle}
+- Add a todo named {itemTitle}
+- Add {itemTitle} to the list
+- [Please] add {itemTitle} to the todo list
+- Add {itemTitle} to my todo
+- add {itemTitle} to my to do list
+- add {itemTitle} to my to dos
+- add a to do that buy {itemTitle}
+- add a to do that purchase {itemTitle}
+- add a to do that shop {itemTitle}
+- add a to do to {itemTitle}
+- add to do that {itemTitle}
+- add to do to {itemTitle}
+- create a to do to {itemTitle}
+- create to do to {itemTitle}
+- remind me to {itemTitle}
+
+# DeleteItem
+- Remove todo
+- Mark {itemTitle = buy milk} as complete
+- Flag {itemTitle = first one} as done
+- Remove {itemTitle = finish this demo} from the todo list
+- remove another one
+- remove
+- clear my todo named {itemTitle = get a new car}
+- I'm done with the first todo
+- I finished the las todo
+- Remove the first todo
+- Delete todo
+- Clear my todos
+- Delete all my todos
+- Remove all my todo
+- Forget the list
+- Purge the todo list
+- can you delete {itemTitle=todo1}
+- can you delete {itemTitle=xxx} item
+- delete {itemTitle=eggs} from list
+- delete off {itemTitle=pancake mix} on the shopping list
+- delete {itemTitle=shampoo} from shopping list
+- delete {itemTitle=shirts} from list
+- delete task {itemTitle=go fishing}
+- delete task {itemTitle=go to cinema tonight}
+- delete the item {itemTitle=buy socks} from my todo list
+- delete the second task in my shopping list
+- delete the task {itemTitle=house cleanup this weekend}
+- delete the task that {itemTitle=hit the gym every morning}
+- delete the to do {itemTitle=meet my friends tomorrow}
+- delete the to do that {itemTitle=daily practice piano}
+- delete the to do that {itemTitle=meet john when he come here the next friday}
+- delete to do {itemTitle=buy milk}
+- delete to do {itemTitle=go shopping}
+- delete to do that {itemTitle=go hiking tomorrow}
+- erase {itemTitle=bananas} from shopping list
+- erase {itemTitle=peanuts} on the shopping list
+- remove {itemTitle=asprin} from shopping list
+- remove {itemTitle=black shoes} from shopping list
+- remove {itemTitle=class} from todo list
+- remove {itemTitle=salad vegetables} from grocery list
+- remove task {itemTitle=buy dog food}
+- remove task {itemTitle=go shopping}
+- remove task that {itemTitle=go hiking this weekend}
+- remove task that {itemTitle=lawn mowing}
+- remove the item {itemTitle=paris} from my list
+- remove the task that {itemTitle=go to library after work}
+- remove the to do {itemTitle=physical examination}
+- remove the to do that {itemTitle=pick tom up at six p.m.}
+- remove to do {itemTitle=go to the gym}
+- remove to do that {itemTitle=go to the dentist tomorrow morning}
+> Add patterns
+- I did {itemTitle}
+- I completed {itemTitle}
+- Delete {itemTitle}
+- Mark {itemTitle} as complete
+- Remove {itemTitle} from my [todo] list
+- [Please] delete {itemTitle} from the list
+
+# ViewCollection
+- show my todo
+- can you please show my todos?
+- please show my todo list
+- todo list please
+- I need to see my todo list
+- can you show me the list?
+- please show the list
+- what do i have on my todo?
+- what is on my list?
+- do i have anything left on my todo list?
+- I hope I do not have any todo left
+- do i have any tasks left?
+- hit me up with more items
+- view my todos
+- can you show my todo
+- see todo
+- I would like to see my todos list`;
+
+export default function App() {
+  const [value, setValue] = useState(content);
+
+  const onChange = value => {
+    setValue(value);
+  };
+
+  const props = {
+    value,
+    onChange,
+  };
+  return <LuEditor {...props} />;
+}
diff --git a/Composer/packages/lib/code-editor/demo/src/multiEditors.tsx b/Composer/packages/lib/code-editor/demo/src/multiEditors.tsx
new file mode 100644
index 0000000000..4c2f641d56
--- /dev/null
+++ b/Composer/packages/lib/code-editor/demo/src/multiEditors.tsx
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import React, { useState, Fragment } from 'react';
+
+import { LgEditor } from '../../src';
+
+const content = `# Greeting1
+-Good morning
+
+# Greeting2
+-Good afternoon
+
+# Greeting3
+-Good evening
+`;
+
+function LGEditor() {
+  const [value, setValue] = useState(content);
+
+  const onChange = value => {
+    setValue(value);
+  };
+
+  const props = {
+    value,
+    onChange,
+    languageServer: {
+      host: 'localhost:5000',
+      path: '/lg-language-server',
+    },
+  };
+  return <LgEditor {...props} />;
+}
+
+export default function App() {
+  const [count, setCount] = useState(1);
+  const editors = Array.from(Array(count).keys()).map(index => {
+    return (
+      <div style={{ width: '500px', height: '300px', float: 'left' }} key={index}>
+        <LGEditor />
+      </div>
+    );
+  });
+  return (
+    <Fragment>
+      <button onClick={() => setCount(1)}>Reset</button>
+      <button onClick={() => setCount(prevCount => prevCount + 1)}>add</button>
+      <button onClick={() => setCount(prevCount => prevCount - 1)}>remove</button>
+      <div>{editors}</div>
+    </Fragment>
+  );
+}
diff --git a/Composer/packages/lib/code-editor/demo/src/App.tsx b/Composer/packages/lib/code-editor/demo/src/richEditor.tsx
similarity index 91%
rename from Composer/packages/lib/code-editor/demo/src/App.tsx
rename to Composer/packages/lib/code-editor/demo/src/richEditor.tsx
index 7a4a51391a..6784fa1030 100644
--- a/Composer/packages/lib/code-editor/demo/src/App.tsx
+++ b/Composer/packages/lib/code-editor/demo/src/richEditor.tsx
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 import React, { useState } from 'react';
 
 import { RichEditor } from '../../src';
@@ -18,11 +21,6 @@ export default function App() {
 > ${LU_HELP}`;
   const errorMsg = showError ? 'example error' : undefined;
 
-  const codeRange = {
-    startLineNumber: 2,
-    endLineNumber: 3,
-  };
-
   return (
     <div style={{ height: '99vh', width: '100%' }}>
       <div style={{ marginBottom: '10px' }}>
@@ -31,7 +29,6 @@ export default function App() {
       <RichEditor
         onChange={newVal => setValue(newVal)}
         value={value}
-        codeRange={codeRange}
         placeholder={placeholder}
         errorMsg={errorMsg}
         helpURL="https://dev.botframework.com"
diff --git a/Composer/packages/lib/code-editor/demo/webpack.config.demo.js b/Composer/packages/lib/code-editor/demo/webpack.config.demo.js
index a539bd5dbb..61dd845d2f 100644
--- a/Composer/packages/lib/code-editor/demo/webpack.config.demo.js
+++ b/Composer/packages/lib/code-editor/demo/webpack.config.demo.js
@@ -1,4 +1,3 @@
-/* eslint-disable */
 const path = require('path');
 
 const webpack = require('webpack');
@@ -95,6 +94,9 @@ module.exports = {
   resolve: {
     extensions: ['.tsx', '.ts', '.js'],
     plugins: [new TsconfigPathsPlugin({ configFile: path.resolve(__dirname, './tsconfig.json') })],
+    alias: {
+      vscode: require.resolve('monaco-languageclient/lib/vscode-compatibility'),
+    },
   },
 
   output: {
@@ -103,6 +105,16 @@ module.exports = {
     path: path.resolve('./demo/dist'),
   },
 
+  node: {
+    module: 'empty',
+    dgram: 'empty',
+    dns: 'mock',
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty',
+    child_process: 'empty',
+  },
+
   plugins: [
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify('development'),
@@ -113,7 +125,7 @@ module.exports = {
     }),
     new MonacoWebpackPlugin({
       // available options are documented at https://github.com/Microsoft/monaco-editor-webpack-plugin#options
-      languages: ['markdown', 'botbuilderlg', 'json'],
+      languages: ['markdown', 'json'],
     }),
   ],
 };
diff --git a/Composer/packages/lib/code-editor/package.json b/Composer/packages/lib/code-editor/package.json
index 9013709386..8e242b1169 100644
--- a/Composer/packages/lib/code-editor/package.json
+++ b/Composer/packages/lib/code-editor/package.json
@@ -16,6 +16,7 @@
     "clean": "rimraf lib demo/dist",
     "prepublishOnly": "npm run build",
     "start": "webpack-dev-server --config demo/webpack.config.demo.js",
+    "build:demo": "webpack --config demo/webpack.config.demo.js",
     "test": "jest",
     "lint": "eslint --quiet --ext .ts,.tsx ./src",
     "lint:fix": "yarn lint --fix",
@@ -32,6 +33,7 @@
     "@babel/plugin-transform-runtime": "^7.4.4",
     "@babel/preset-env": "^7.4.5",
     "@babel/preset-react": "^7.0.0",
+    "@types/express": "^4.17.1",
     "@types/jest": "^24.0.11",
     "@types/lodash": "^4.14.146",
     "@types/react": "16.9.0",
@@ -39,6 +41,7 @@
     "autoprefixer": "^9.5.1",
     "copyfiles": "^2.1.0",
     "css-loader": "^2.1.1",
+    "express": "^4.17.1",
     "html-webpack-plugin": "^3.2.0",
     "jest": "24.0.0",
     "jest-dom": "^3.1.3",
@@ -52,13 +55,21 @@
     "ts-jest": "^24.1.0",
     "ts-loader": "^5.3.3",
     "url-loader": "^1.1.2",
-    "webpack": "^4.30.0",
+    "webpack": "4.41.2",
     "webpack-cli": "^3.3.2",
-    "webpack-dev-server": "^3.8.2"
+    "webpack-dev-server": "^3.9.0"
   },
   "dependencies": {
+    "@bfc/lg-languageserver": "*",
     "@bfcomposer/monaco-editor-webpack-plugin": "^1.7.2",
     "@bfcomposer/react-monaco-editor": "0.30.12",
-    "lodash": "^4.17.15"
+    "@types/node": "^12.12.8",
+    "@types/vscode": "^1.40.0",
+    "lodash": "^4.17.15",
+    "monaco-editor-core": "0.17.0",
+    "monaco-languageclient": "^0.10.0",
+    "normalize-url": "^4.5.0",
+    "reconnecting-websocket": "^3.2.2",
+    "vscode-ws-jsonrpc": "^0.1.1"
   }
 }
diff --git a/Composer/packages/lib/code-editor/src/BaseEditor.tsx b/Composer/packages/lib/code-editor/src/BaseEditor.tsx
index 7d5cb02801..63a94966c5 100644
--- a/Composer/packages/lib/code-editor/src/BaseEditor.tsx
+++ b/Composer/packages/lib/code-editor/src/BaseEditor.tsx
@@ -6,6 +6,8 @@ import * as monacoEditor from '@bfcomposer/monaco-editor/esm/vs/editor/editor.ap
 import MonacoEditor, { MonacoEditorProps } from '@bfcomposer/react-monaco-editor';
 import throttle from 'lodash/throttle';
 
+import { assignDefined } from './utils/common';
+
 const defaultOptions: monacoEditor.editor.IEditorConstructionOptions = {
   scrollBeyondLastLine: false,
   wordWrap: 'off',
@@ -23,24 +25,15 @@ const defaultOptions: monacoEditor.editor.IEditorConstructionOptions = {
   renderLineHighlight: 'none',
 };
 
-interface ICodeRange {
-  startLineNumber: number;
-  endLineNumber: number;
-}
-
 export interface BaseEditorProps extends Omit<MonacoEditorProps, 'height'> {
   onChange: (newValue: string) => void;
   placeholder?: string;
   value?: string;
-  codeRange?: Partial<ICodeRange> | -1;
 }
 
 export function BaseEditor(props: BaseEditorProps) {
-  const { onChange, placeholder, value, codeRange } = props;
-  const options = Object.assign({}, defaultOptions, props.options);
-  if (options.folding && codeRange) {
-    options.folding = false;
-  }
+  const { onChange, placeholder, value } = props;
+  const options = assignDefined(defaultOptions, props.options);
   const containerRef = useRef<HTMLDivElement>(null);
   const [rect, setRect] = useState({ height: 0, width: 0 });
 
@@ -71,51 +64,10 @@ export function BaseEditor(props: BaseEditorProps) {
     updateRect();
   }, []);
 
-  const updateEditorCodeRangeUI = (editor?: monacoEditor.editor.IStandaloneCodeEditor | any) => {
-    if (codeRange && editor) {
-      // subtraction a hiddenAreaRange from CodeRange
-      // Tips, monaco lineNumber start from 1
-      const model = editor.getModel();
-      const lineCount = model && model.getLineCount();
-
-      // -1 is end line of file
-      if (codeRange === -1) {
-        editor.setHiddenAreas([
-          {
-            startLineNumber: 1,
-            endLineNumber: lineCount - 1,
-          },
-        ]);
-        return;
-      }
-      const hiddenRanges = [
-        {
-          startLineNumber: 1,
-          endLineNumber: (codeRange.startLineNumber || 1) - 1,
-        },
-        {
-          startLineNumber: (codeRange.endLineNumber || 1) + 1,
-          endLineNumber: lineCount,
-        },
-      ];
-
-      // code range start from first line, update hiddenRanges
-      if (codeRange.startLineNumber === 1) {
-        hiddenRanges.shift();
-      }
-      // code range end at last line, update hiddenRanges
-      if (codeRange.endLineNumber === lineCount) {
-        hiddenRanges.pop();
-      }
-      editor.setHiddenAreas(hiddenRanges);
-    }
-  };
-
   const editorDidMount = (editor: monacoEditor.editor.IStandaloneCodeEditor, monaco: typeof monacoEditor) => {
     if (typeof props.editorDidMount === 'function') {
       props.editorDidMount(editor, monaco);
     }
-    updateEditorCodeRangeUI(editor);
   };
 
   return (
diff --git a/Composer/packages/lib/code-editor/src/JsonEditor.tsx b/Composer/packages/lib/code-editor/src/JsonEditor.tsx
index 19aaeff901..26dc3e87cf 100644
--- a/Composer/packages/lib/code-editor/src/JsonEditor.tsx
+++ b/Composer/packages/lib/code-editor/src/JsonEditor.tsx
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-
 import React, { useState, useEffect } from 'react';
 import { editor } from '@bfcomposer/monaco-editor';
 import { EditorWillMount } from '@bfcomposer/react-monaco-editor';
diff --git a/Composer/packages/lib/code-editor/src/LgEditor.tsx b/Composer/packages/lib/code-editor/src/LgEditor.tsx
index 0f8ed1de0d..345184da94 100644
--- a/Composer/packages/lib/code-editor/src/LgEditor.tsx
+++ b/Composer/packages/lib/code-editor/src/LgEditor.tsx
@@ -2,7 +2,14 @@
 // Licensed under the MIT License.
 
 import React from 'react';
+import { listen, MessageConnection } from 'vscode-ws-jsonrpc';
+import * as monacoEditor from '@bfcomposer/monaco-editor/esm/vs/editor/editor.api';
+import * as monacoCore from 'monaco-editor-core';
+import get from 'lodash/get';
+import { MonacoServices, MonacoLanguageClient } from 'monaco-languageclient';
 
+import { registerLGLanguage } from './languages';
+import { createUrl, createWebSocket, createLanguageClient } from './utils/lspUtil';
 import { RichEditor, RichEditorProps } from './RichEditor';
 
 const LG_HELP =
@@ -10,19 +17,106 @@ const LG_HELP =
 const placeholder = `> To learn more about the LG file format, read the documentation at
 > ${LG_HELP}`;
 
-export function LgEditor(props: RichEditorProps) {
+export interface LGOption {
+  inline: boolean;
+  content: string;
+  template?: {
+    Name: string;
+    Parameters?: string[];
+    Body: string;
+  };
+}
+
+export interface LGLSPEditorProps extends RichEditorProps {
+  lgOption?: LGOption;
+  languageServer?:
+    | {
+        host?: string;
+        hostname?: string;
+        port?: number | string;
+        path: string;
+      }
+    | string;
+}
+
+const defaultLGServer = {
+  path: '/lg-language-server',
+};
+declare global {
+  interface Window {
+    monacoServiceInstance: MonacoServices;
+    monacoLGEditorInstance: MonacoLanguageClient;
+  }
+}
+
+async function initializeDocuments(lgOption: LGOption | undefined, uri: string) {
+  const languageClient = window.monacoLGEditorInstance;
+  if (languageClient) {
+    await languageClient.onReady();
+    if (lgOption && lgOption.inline) {
+      languageClient.sendRequest('initializeDocuments', { ...lgOption, uri });
+    } else {
+      languageClient.sendRequest('initializeDocuments', { uri });
+    }
+  }
+}
+
+export function LgEditor(props: LGLSPEditorProps) {
   const options = {
     quickSuggestions: true,
     ...props.options,
   };
+
+  const { lgOption, languageServer, ...restProps } = props;
+  const lgServer = languageServer || defaultLGServer;
+
+  const editorWillMount = (monaco: typeof monacoEditor) => {
+    registerLGLanguage(monaco);
+    if (typeof props.editorWillMount === 'function') {
+      return props.editorWillMount(monaco);
+    }
+  };
+  const editorDidMount = (editor: monacoEditor.editor.IStandaloneCodeEditor, monaco: typeof monacoEditor) => {
+    if (!window.monacoServiceInstance) {
+      window.monacoServiceInstance = MonacoServices.install(editor as (monacoCore.editor.IStandaloneCodeEditor | any));
+    }
+
+    if (!window.monacoLGEditorInstance) {
+      const uri = get(editor.getModel(), 'uri._formatted', '');
+      const url = createUrl(lgServer);
+      const webSocket: WebSocket = createWebSocket(url);
+      listen({
+        webSocket,
+        onConnection: (connection: MessageConnection) => {
+          const languageClient = createLanguageClient('LG Language Client', ['botbuilderlg'], connection);
+          if (!window.monacoLGEditorInstance) {
+            window.monacoLGEditorInstance = languageClient;
+          }
+          initializeDocuments(lgOption, uri);
+          const disposable = languageClient.start();
+          connection.onClose(() => disposable.dispose());
+        },
+      });
+    } else {
+      const uri = get(editor.getModel(), 'uri._formatted', '');
+      initializeDocuments(lgOption, uri);
+    }
+
+    if (typeof props.editorDidMount === 'function') {
+      return props.editorDidMount(editor, monaco);
+    }
+  };
+
   return (
     <RichEditor
       placeholder={placeholder}
       helpURL={LG_HELP}
-      {...props}
+      {...restProps}
       theme={'lgtheme'}
       language={'botbuilderlg'}
       options={options}
+      editorWillMount={editorWillMount}
+      editorDidMount={editorDidMount}
     />
   );
 }
diff --git a/Composer/packages/lib/code-editor/src/RichEditor.tsx b/Composer/packages/lib/code-editor/src/RichEditor.tsx
index a882ff41f4..788329b9aa 100644
--- a/Composer/packages/lib/code-editor/src/RichEditor.tsx
+++ b/Composer/packages/lib/code-editor/src/RichEditor.tsx
@@ -6,6 +6,7 @@ import { SharedColors, NeutralColors } from '@uifabric/fluent-theme';
 import formatMessage from 'format-message';
 
 import { BaseEditor, BaseEditorProps } from './BaseEditor';
+import { processSize } from './utils/common';
 
 export interface RichEditorProps extends BaseEditorProps {
   hidePlaceholder?: boolean; // default false
@@ -37,11 +38,7 @@ export function RichEditor(props: RichEditorProps) {
       return '100%';
     }
 
-    if (typeof height === 'string') {
-      return height;
-    }
-
-    return `${height}px`;
+    return processSize(height);
   };
 
   let borderColor = NeutralColors.gray120;
diff --git a/Composer/packages/lib/code-editor/src/languages/index.ts b/Composer/packages/lib/code-editor/src/languages/index.ts
new file mode 100644
index 0000000000..7014f7824e
--- /dev/null
+++ b/Composer/packages/lib/code-editor/src/languages/index.ts
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+export * from './lg';
diff --git a/Composer/packages/lib/code-editor/src/languages/lg.ts b/Composer/packages/lib/code-editor/src/languages/lg.ts
new file mode 100644
index 0000000000..410930e7d1
--- /dev/null
+++ b/Composer/packages/lib/code-editor/src/languages/lg.ts
@@ -0,0 +1,110 @@
+/* eslint-disable @typescript-eslint/camelcase, no-useless-escape */
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import * as monacoEditor from '@bfcomposer/monaco-editor/esm/vs/editor/editor.api';
+
+export function registerLGLanguage(monaco: typeof monacoEditor) {
+  monaco.languages.setMonarchTokensProvider('botbuilderlg', {
+    ignoreCase: true,
+    brackets: [
+      { open: '{', close: '}', token: 'delimiter.curly' },
+      { open: '[', close: ']', token: 'delimiter.bracket' },
+      { open: '(', close: ')', token: 'delimiter.parenthesis' },
+    ],
+    tokenizer: {
+      root: [
+        // template name line
+        [/^\s*#/, { token: 'template-name', next: '@template_name' }],
+        // template body
+        [/^\s*-/, { token: 'template-body-identifier', goBack: 1, next: '@template_body' }],
+        //comments
+        [/^\s*>/, { token: 'comments', next: '@comments' }],
+        //dealing with inline-lg
+        [/^\s*\[/, { token: 'structure-lg-identifier', goBack: 1, next: '@structure_lg' }],
+      ],
+      comments: [
+        [/^\s*#/, { token: 'template-name', next: '@template_name' }],
+        [/^\s*-/, { token: 'template-body-identifier', next: '@template_body' }],
+        [/.*$/, 'comments', '@pop'],
+      ],
+      template_name: [
+        //comments
+        [/^\s*>/, { token: 'comments', next: '@comments' }],
+        //fence block
+        [/^\s*-\s*`{3}/, { token: 'fence-block', next: '@fence_block' }],
+        //template_body
+        [/^\s*-/, { token: 'template-body-identifier', goBack: 1, next: '@template_body' }],
+        // structure_lg
+        [/^\s*\[/, { token: 'structure-lg-identifier', goBack: 1, next: '@structure_lg' }],
+        //parameter in template name
+        [/([a-zA-Z0-9_.'-]+)(,|\))/, ['parameter', 'delimeter']],
+        //expression
+        [/@\{/, { token: 'expression', next: '@expression' }],
+        // other
+        [/[^\()]/, 'template-name'],
+      ],
+      template_body: [
+        //comments
+        [/^\s*>/, { token: 'comments', next: '@comments' }],
+        //template name
+        [/^\s*#/, { token: 'template-name', next: '@template_name' }],
+        //keywords
+        [/(\s*-\s*)(if|else|else\s*if|switch|case|default)(\s*:)/, ['identifier', 'keywords', 'colon']],
+        //fence block
+        [/^\s*-\s*`{3}/, { token: 'fence-block', next: '@fence_block' }],
+        //template_body
+        [/^\s*-/, { token: 'template-body-identifier', next: '@template_body' }],
+        //expression
+        [/@\{/, { token: 'expression', next: '@expression' }],
+      ],
+
+      fence_block: [
+        // There are only expression and normal text in multi-line mode
+        [/`{3}\s*$/, 'fence-block', '@pop'],
+        [/@\{/, { token: 'expression', next: '@expression' }],
+        [/./, 'fence-block.content'],
+      ],
+      expression: [
+        [/\}/, 'expression', '@pop'],
+        [/([a-zA-Z][a-zA-Z0-9_.-]*)(\s*\()/, [{ token: 'function-name' }, { token: 'param_identifier' }]],
+        [/'[\s\S]*?'/, 'string'],
+        [/([a-zA-Z][a-zA-Z0-9_.-]*)(,|\))/, ['parameter', 'delimeter']],
+        [/([a-zA-Z][a-zA-Z0-9_.-]*)/, 'parameter'],
+        [/[0-9.]+/, 'number'],
+        [/./, 'expression.content'],
+      ],
+      structure_lg: [
+        [/^\s*\]\s*$/, 'structure-lg', '@pop'],
+        [/\]\s*$/, 'imports', '@pop'],
+        [/(\s*\[\s*)([a-zA-Z0-9_-]+\s*$)/, ['stucture-lg-identifier', 'structure-name']],
+        [/^\s*>[\s\S]*$/, 'comments'],
+        [/@\{/, { token: 'expression', next: '@expression' }],
+        [/.*=/, { token: 'structure-property' }],
+        [/./, 'structure-lg.content'],
+      ],
+    },
+  });
+
+  monaco.languages.register({
+    id: 'botbuilderlg',
+    extensions: ['.lg'],
+    aliases: ['LG', 'language-generation'],
+    mimetypes: ['application/lg'],
+  });
+
+  monaco.editor.defineTheme('lgtheme', {
+    base: 'vs',
+    inherit: false,
+    colors: {},
+    rules: [
+      { token: 'template-name', foreground: '0000FF' },
+      { token: 'function-name', foreground: '79571E' },
+      { token: 'keywords', foreground: '0000FF' },
+      { token: 'comments', foreground: '7A7574' },
+      { token: 'number', foreground: '00A32B' },
+      { token: 'string', foreground: 'DF2C2C' },
+      { token: 'structure-name', foreground: '00B7C3' },
+    ],
+  });
+}
diff --git a/Composer/packages/lib/code-editor/src/utils/common.ts b/Composer/packages/lib/code-editor/src/utils/common.ts
new file mode 100644
index 0000000000..ed52d00037
--- /dev/null
+++ b/Composer/packages/lib/code-editor/src/utils/common.ts
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+export function processSize(size) {
+  return !/^\d+$/.test(size) ? size : `${size}px`;
+}
+
+/**
+ * assign to target[key] if sources[key] != undefined
+ * @param target   {a:1}
+ * @param sources  {a:undefined,c:3})
+ *
+ * Object.assign ---> {a:undefined,c:3})
+ * assignDefined ---> {a: 1, c:3}
+ */
+export function assignDefined(target, ...sources) {
+  const copyTarget = { ...target };
+  for (const source of sources) {
+    for (const key in source) {
+      const val = source[key];
+      if (typeof val !== 'undefined') {
+        copyTarget[key] = val;
+      }
+    }
+  }
+  return copyTarget;
+}
diff --git a/Composer/packages/lib/code-editor/src/utils/index.ts b/Composer/packages/lib/code-editor/src/utils/index.ts
index 8d2748f8bc..848e05d6d4 100644
--- a/Composer/packages/lib/code-editor/src/utils/index.ts
+++ b/Composer/packages/lib/code-editor/src/utils/index.ts
@@ -2,3 +2,4 @@
 // Licensed under the MIT License.
 
 export * from './obfuscate';
+export * from './common';
diff --git a/Composer/packages/lib/code-editor/src/utils/lspUtil.ts b/Composer/packages/lib/code-editor/src/utils/lspUtil.ts
new file mode 100644
index 0000000000..b45203adbd
--- /dev/null
+++ b/Composer/packages/lib/code-editor/src/utils/lspUtil.ts
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import * as normalizeUrl from 'normalize-url';
+import ReconnectingWebSocket from 'reconnecting-websocket';
+import { MessageConnection } from 'vscode-ws-jsonrpc';
+import {
+  MonacoLanguageClient,
+  CloseAction,
+  ErrorAction,
+  createConnection,
+  LanguageClientOptions,
+} from 'monaco-languageclient';
+
+export function createUrl(server: { [key: string]: string } | string): string {
+  if (typeof server === 'string') {
+    return normalizeUrl.default(server).replace(/^http/, 'ws');
+  }
+  const { host, hostname = location.hostname, port = location.port, path = '/' } = server;
+  const protocol = location.protocol === 'https:' ? 'wss' : 'ws';
+  const endHost = host || `${hostname}:${port}`;
+  return normalizeUrl.default(`${protocol}://${endHost}/${path}`);
+}
+
+export function createWebSocket(url: string): WebSocket {
+  const socketOptions = {
+    constructor: WebSocket,
+    maxReconnectionDelay: 10000,
+    minReconnectionDelay: 1000,
+    reconnectionDelayGrowFactor: 1.3,
+    connectionTimeout: 10000,
+    maxRetries: 500,
+    debug: false,
+  };
+  return new ReconnectingWebSocket(url, [], socketOptions);
+}
+
+export function createLanguageClient(
+  name: string,
+  documentSelector: LanguageClientOptions['documentSelector'],
+  connection: MessageConnection
+): MonacoLanguageClient {
+  return new MonacoLanguageClient({
+    name,
+    clientOptions: {
+      // use a language id as a document selector
+      documentSelector,
+      // disable the default error handler
+      errorHandler: {
+        error: () => ErrorAction.Continue,
+        closed: () => CloseAction.DoNotRestart,
+      },
+    },
+    // create a language client connection from the JSON RPC connection on demand
+    connectionProvider: {
+      get: (errorHandler, closeHandler) => {
+        return Promise.resolve(createConnection(connection, errorHandler, closeHandler));
+      },
+    },
+  });
+}
diff --git a/Composer/packages/lib/code-editor/tsconfig.build.json b/Composer/packages/lib/code-editor/tsconfig.build.json
index 398b6a50b3..2763d8e7d7 100644
--- a/Composer/packages/lib/code-editor/tsconfig.build.json
+++ b/Composer/packages/lib/code-editor/tsconfig.build.json
@@ -1,4 +1,6 @@
 {
   "extends": "./tsconfig.json",
-  "include": ["./src/**/*"]
-}
+  "include": [
+    "./src/**/*"
+  ]
+}
\ No newline at end of file
diff --git a/Composer/packages/lib/code-editor/tsconfig.json b/Composer/packages/lib/code-editor/tsconfig.json
index bdcff025b4..7a7934ab8e 100644
--- a/Composer/packages/lib/code-editor/tsconfig.json
+++ b/Composer/packages/lib/code-editor/tsconfig.json
@@ -3,5 +3,11 @@
   "compilerOptions": {
     "outDir": "lib"
   },
-  "include": ["./src/**/*", "./__tests__/**/*"]
+  "include": [
+    "./src/**/*",
+    "./__tests__/**/*"
+  ],
+  "exclude": [
+    "node_modules"
+  ],
 }
diff --git a/Composer/packages/lib/shared/src/labelMap.ts b/Composer/packages/lib/shared/src/labelMap.ts
index 889fccdd8f..dec4ca588d 100644
--- a/Composer/packages/lib/shared/src/labelMap.ts
+++ b/Composer/packages/lib/shared/src/labelMap.ts
@@ -11,6 +11,7 @@ formatMessage.setup({
 
 interface LabelOverride {
   title?: string | false;
+  subtitle?: string | false;
   description?: string | false;
 }
 
@@ -118,66 +119,85 @@ export const ConceptLabels: { [key in ConceptLabelKey]?: LabelOverride } = {
     title: formatMessage('OAuth login'),
   },
   [SDKTypes.OnActivity]: {
-    title: formatMessage('Activity trigger'),
+    title: formatMessage('Activities'),
+    subtitle: formatMessage('Activity recieved'),
   },
   [SDKTypes.OnBeginDialog]: {
-    title: formatMessage('Dialog started (BeginDialog)'),
+    title: formatMessage('Dialog started'),
+    subtitle: formatMessage('Begin dialog event'),
   },
   [SDKTypes.OnCancelDialog]: {
-    title: formatMessage('Dialog cancelled (CancelDialog)'),
+    title: formatMessage('Dialog cancelled'),
+    subtitle: formatMessage('Cancel dialog event'),
   },
   [SDKTypes.OnCondition]: {
     title: formatMessage('Handle a Condition'),
   },
   [SDKTypes.OnConversationUpdateActivity]: {
-    title: formatMessage('Greeting (ConversationUpdate)'),
+    title: formatMessage('Greeting'),
+    subtitle: formatMessage('ConversationUpdate activity'),
     description:
       'Handle the events fired when a user begins a new conversation with the bot. <a href="https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-conversations?view=azure-bot-service-4.0#conversation-lifetime" target="_blank">Learn more</a>',
   },
   [SDKTypes.OnCustomEvent]: {
-    title: formatMessage('Custom trigger'),
+    title: formatMessage('Custom event'),
+    subtitle: formatMessage('Custom event'),
   },
   [SDKTypes.OnDialogEvent]: {
-    title: formatMessage('Dialog trigger'),
+    title: formatMessage('Dialog events'),
+    subtitle: formatMessage('Dialog events'),
   },
   [SDKTypes.OnEndOfConversationActivity]: {
     title: formatMessage('Conversation ended'),
+    subtitle: formatMessage('EndOfConversation activity'),
   },
   [SDKTypes.OnError]: {
     title: formatMessage('Error occurred'),
+    subtitle: formatMessage('Error event'),
   },
   [SDKTypes.OnEventActivity]: {
     title: formatMessage('Event received'),
+    subtitle: formatMessage('Event activity'),
   },
   [SDKTypes.OnHandoffActivity]: {
     title: formatMessage('Handover to human'),
+    subtitle: formatMessage('Handoff activity'),
   },
   [SDKTypes.OnIntent]: {
-    title: formatMessage('Intent'),
+    title: formatMessage('Intent recognized'),
+    subtitle: formatMessage('Intent recognized'),
   },
   [SDKTypes.OnInvokeActivity]: {
     title: formatMessage('Conversation invoked'),
+    subtitle: formatMessage('Invoke activity'),
   },
   [SDKTypes.OnMessageActivity]: {
-    title: formatMessage('Message activity trigger'),
+    title: formatMessage('Message events'),
+    subtitle: formatMessage('Message recieved activity'),
   },
   [SDKTypes.OnMessageDeleteActivity]: {
     title: formatMessage('Message deleted'),
+    subtitle: formatMessage('Message deleted activity'),
   },
   [SDKTypes.OnMessageReactionActivity]: {
     title: formatMessage('Message reaction'),
+    subtitle: formatMessage('Message reaction activity'),
   },
   [SDKTypes.OnMessageUpdateActivity]: {
     title: formatMessage('Message updated'),
+    subtitle: formatMessage('Message updated activity'),
   },
   [SDKTypes.OnRepromptDialog]: {
     title: formatMessage('Re-prompt for input'),
+    subtitle: formatMessage('Reprompt dialog event'),
   },
   [SDKTypes.OnTypingActivity]: {
     title: formatMessage('User is typing'),
+    subtitle: formatMessage('Typing activity'),
   },
   [SDKTypes.OnUnknownIntent]: {
-    title: formatMessage('Unrecognized intent'),
+    title: formatMessage('Unknown intent'),
+    subtitle: formatMessage('Unknown intent recognized'),
   },
   [SDKTypes.QnAMakerDialog]: {
     title: formatMessage('Connect to QnA Knowledgebase'),
diff --git a/Composer/packages/lib/shared/src/viewUtils.ts b/Composer/packages/lib/shared/src/viewUtils.ts
index 332383dc6c..5a59ce4c15 100644
--- a/Composer/packages/lib/shared/src/viewUtils.ts
+++ b/Composer/packages/lib/shared/src/viewUtils.ts
@@ -110,6 +110,7 @@ export const dialogGroups: DialogGroupsMap = {
   [DialogGroup.ADVANCED_EVENTS]: {
     label: 'Advanced Events',
     types: [
+      SDKTypes.OnActivity,
       SDKTypes.OnConversationUpdateActivity,
       SDKTypes.OnEndOfConversationActivity,
       SDKTypes.OnEventActivity,
@@ -120,7 +121,12 @@ export const dialogGroups: DialogGroupsMap = {
   },
   [DialogGroup.MESSAGE_EVENTS]: {
     label: 'Message events',
-    types: [SDKTypes.OnMessageDeleteActivity, SDKTypes.OnMessageReactionActivity, SDKTypes.OnMessageUpdateActivity],
+    types: [
+      SDKTypes.OnMessageActivity,
+      SDKTypes.OnMessageDeleteActivity,
+      SDKTypes.OnMessageReactionActivity,
+      SDKTypes.OnMessageUpdateActivity,
+    ],
   },
   [DialogGroup.RECOGNIZER]: {
     label: 'Recognizers',
diff --git a/Composer/packages/server/package.json b/Composer/packages/server/package.json
index 3ec2c1ce72..9ecbc4df58 100644
--- a/Composer/packages/server/package.json
+++ b/Composer/packages/server/package.json
@@ -56,6 +56,7 @@
   "dependencies": {
     "@azure/ms-rest-js": "^1.8.7",
     "@bfc/indexers": "*",
+    "@bfc/lg-languageserver": "*",
     "@bfc/shared": "*",
     "archiver": "^3.0.0",
     "axios": "^0.18.0",
@@ -78,6 +79,9 @@
     "lubuild": "https://botbuilder.myget.org/F/botbuilder-declarative/npm/lubuild/-/1.0.3-preview.tgz",
     "luis-apis": "2.5.1",
     "minimatch": "^3.0.4",
-    "morgan": "^1.9.1"
+    "morgan": "^1.9.1",
+    "vscode-languageserver": "^5.3.0-next",
+    "vscode-ws-jsonrpc": "^0.1.1",
+    "ws": "^5.0.0"
   }
 }
diff --git a/Composer/packages/server/schemas/editor.schema b/Composer/packages/server/schemas/editor.schema
index c4fc174b0e..b6bb740327 100644
--- a/Composer/packages/server/schemas/editor.schema
+++ b/Composer/packages/server/schemas/editor.schema
@@ -29,6 +29,10 @@
       "helpLink": "https://aka.ms/bfc-understanding-dialogs",
       "helpLinkText": "Learn more"
     },
+    "Microsoft.OnCancelDialog": {
+      "title": "Dialog cancelled",
+      "subtitle": "Cancel dialog event"
+    },
     "Microsoft.CancelAllDialogs": {
       "title": "Cancel All Dialogs",
       "helpLink": "https://aka.ms/bfc-understanding-dialogs",
@@ -144,58 +148,83 @@
       "helpLink": "https://aka.ms/bfc-using-oauth"
     },
     "Microsoft.OnActivity": {
-      "title": "Activity trigger"
+      "title": "Activities",
+      "subtitle": "Activity recieved"
     },
     "Microsoft.OnBeginDialog": {
-      "title": "Dialog started (BeginDialog)"
+      "title": "Dialog started",
+      "subtitle": "Begin dialog event"
     },
     "Microsoft.OnConversationUpdateActivity": {
-      "title": "Greeting (ConversationUpdate)",
+      "title": "Greeting",
+      "subtitle": "ConversationUpdate activity",
       "description": "Handle the events fired when a user begins a new conversation with the bot.",
       "helpLink": "https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-conversations?view=azure-bot-service-4.0#conversation-lifetime",
       "helpLinkText": "Learn more"
     },
     "Microsoft.OnDialogEvent": {
-      "title": "Dialog event"
+      "title": "Dialog events",
+      "subtitle": "Dialog event"
     },
     "Microsoft.OnEndOfConversationActivity": {
-      "title": "Conversation ended"
+      "title": "Conversation ended",
+      "subtitle": "EndOfConversation activity"
     },
     "Microsoft.OnCondition": {
-      "title": "Handle an condition"
+      "title": "Handle a condition",
+      "subtitle": "Condition"
     },
     "Microsoft.OnCustomEvent": {
-      "title": "Handle an Event"
+      "title": "Handle an Event",
+      "subtitle": "Custom event"
     },
     "Microsoft.OnEventActivity": {
-      "title": "Event received"
+      "title": "Event received",
+      "subtitle": "Event activity"
+    },
+    "Microsoft.OnError": {
+      "title": "Error occurred",
+      "subtitle": "Error event"
     },
     "Microsoft.OnHandoffActivity": {
-      "title": "Handover to human"
+      "title": "Handover to human",
+      "subtitle": "Handoff activity"
     },
     "Microsoft.OnIntent": {
-      "title": "Intent"
+      "title": "Intent recognized",
+      "subtitle": "Intent recognized"
     },
     "Microsoft.OnInvokeActivity": {
-      "title": "Conversation invoked"
+      "title": "Conversation invoked",
+      "subtitle": "Invoke activity"
     },
     "Microsoft.OnMessageActivity": {
-      "title": "Message received"
+      "title": "Message events",
+      "subtitle": "Message recieved activity"
     },
     "Microsoft.OnMessageDeleteActivity": {
-      "title": "Message deleted"
+      "title": "Message deleted",
+      "subtitle": "Message deleted activity"
     },
     "Microsoft.OnMessageReactionActivity": {
-      "title": "Message reaction"
+      "title": "Message reaction",
+      "subtitle": "Message reaction activity"
     },
     "Microsoft.OnMessageUpdateActivity": {
-      "title": "Message updated"
+      "title": "Message updated",
+      "subtitle": "Message updated activity"
     },
     "Microsoft.OnTypingActivity": {
-      "title": "User is typing"
+      "title": "User is typing",
+      "subtitle": "Typing activity"
+    },
+    "Microsoft.OnRepromptDialog": {
+      "title": "Re-prompt for input",
+      "subtitle": "Reprompt dialog event"
     },
     "Microsoft.OnUnknownIntent": {
-      "title": "Unrecognized intent"
+      "title": "Unknown intent",
+      "subtitle": "Unknown intent recognized"
     },
     "Microsoft.QnAMakerDialog": {
       "title": "QnAMakerDialog",
diff --git a/Composer/packages/server/src/controllers/project.ts b/Composer/packages/server/src/controllers/project.ts
index 7753fbdc84..9a5b391a86 100644
--- a/Composer/packages/server/src/controllers/project.ts
+++ b/Composer/packages/server/src/controllers/project.ts
@@ -5,6 +5,7 @@ import * as fs from 'fs';
 
 import { Request, Response } from 'express';
 
+import log from '../logger';
 import { BotProjectService } from '../services/project';
 import AssectService from '../services/asset';
 import { LocationRef } from '../models/bot/interface';
@@ -37,6 +38,8 @@ async function createProject(req: Request, res: Response) {
     path: Path.resolve(path, name),
   };
 
+  log('Attempting to create project at %s', path);
+
   try {
     const newProjRef = await AssectService.manager.copyProjectTemplateTo(templateId, locationRef);
     await BotProjectService.openProject(newProjRef);
@@ -45,6 +48,7 @@ async function createProject(req: Request, res: Response) {
       await currentProject.updateBotInfo(name, description);
       await currentProject.index();
       const project = currentProject.getIndexes();
+      log('Project created successfully.');
       res.status(200).json({
         ...project,
       });
diff --git a/Composer/packages/server/src/models/asset/assetManager.ts b/Composer/packages/server/src/models/asset/assetManager.ts
index 4ecedd844d..440b5b4ace 100644
--- a/Composer/packages/server/src/models/asset/assetManager.ts
+++ b/Composer/packages/server/src/models/asset/assetManager.ts
@@ -4,6 +4,7 @@
 import find from 'lodash/find';
 import { ProjectTemplate } from '@bfc/shared';
 
+import log from '../../logger';
 import { LocalDiskStorage } from '../storage/localDiskStorage';
 import { LocationRef } from '../bot/interface';
 import { Path } from '../../utility/path';
@@ -171,6 +172,7 @@ export class AssetManager {
     const dstStorage = StorageService.getStorageClient(ref.storageId);
     const dstDir = Path.resolve(ref.path);
     if (await dstStorage.exists(dstDir)) {
+      log('Failed copying template to %s', dstDir);
       throw new Error('already have this folder, please give another name');
     }
 
diff --git a/Composer/packages/server/src/server.ts b/Composer/packages/server/src/server.ts
index 0114f67a97..2c0e980fa1 100644
--- a/Composer/packages/server/src/server.ts
+++ b/Composer/packages/server/src/server.ts
@@ -9,10 +9,16 @@ import express, { Express, Request, Response, NextFunction } from 'express';
 import bodyParser from 'body-parser';
 import morgan from 'morgan';
 import compression from 'compression';
+import * as ws from 'ws';
+import * as rpc from 'vscode-ws-jsonrpc';
+import { IConnection, createConnection } from 'vscode-languageserver';
+import { LGServer } from '@bfc/lg-languageserver';
 
 import { getAuthProvider } from './router/auth';
 import { apiRouter } from './router/api';
 import { BASEURL } from './constants';
+import { attachLSPServer } from './utility/attachLSP';
+import log from './logger';
 
 const app: Express = express();
 app.set('view engine', 'ejs');
@@ -81,7 +87,7 @@ app.use(`${BASEURL}/api`, authorize, apiRouter);
 
 app.use(function(err: Error, req: Request, res: Response, _next: NextFunction) {
   if (err) {
-    console.log(err);
+    log(err);
     res.status(500).json({ message: err.message });
   }
 });
@@ -95,9 +101,33 @@ app.get('*', function(req, res) {
 });
 
 const port = process.env.PORT || 5000;
-app.listen(port, () => {
+const server = app.listen(port, () => {
   if (process.env.NODE_ENV === 'production') {
     // eslint-disable-next-line no-console
     console.log(`\n\nComposer now running at:\n\nhttp://localhost:${port}\n`);
   }
 });
+
+const wss: ws.Server = new ws.Server({
+  noServer: true,
+  perMessageDeflate: false,
+});
+
+function launchLanguageServer(socket: rpc.IWebSocket) {
+  const reader = new rpc.WebSocketMessageReader(socket);
+  const writer = new rpc.WebSocketMessageWriter(socket);
+  const connection: IConnection = createConnection(reader, writer);
+  const server = new LGServer(connection);
+  server.start();
+}
+
+attachLSPServer(wss, server, '/lg-language-server', webSocket => {
+  // launch language server when the web socket is opened
+  if (webSocket.readyState === webSocket.OPEN) {
+    launchLanguageServer(webSocket);
+  } else {
+    webSocket.on('open', () => {
+      launchLanguageServer(webSocket);
+    });
+  }
+});
diff --git a/Composer/packages/server/src/services/project.ts b/Composer/packages/server/src/services/project.ts
index ef966bba08..8bbbba378e 100644
--- a/Composer/packages/server/src/services/project.ts
+++ b/Composer/packages/server/src/services/project.ts
@@ -7,6 +7,7 @@ import find from 'lodash/find';
 import { BotProject } from '../models/bot/botProject';
 import { LocationRef } from '../models/bot/interface';
 import { Store } from '../store/store';
+import log from '../logger';
 
 import StorageService from './storage';
 import { Path } from './../utility/path';
@@ -44,7 +45,7 @@ export class BotProjectService {
         dateModified = await StorageService.getBlobDateModified(project.storageId, project.path);
         dateModifiedDict.push({ dateModified, path: project.path });
       } catch (err) {
-        console.error(err);
+        log(err);
       }
     });
     await Promise.all(promises);
diff --git a/Composer/packages/server/src/store/store.ts b/Composer/packages/server/src/store/store.ts
index b8af7d62ec..ef071fafa1 100644
--- a/Composer/packages/server/src/store/store.ts
+++ b/Composer/packages/server/src/store/store.ts
@@ -67,6 +67,7 @@ class JsonStore implements KVStore {
 
   private ensureStore() {
     if (!fs.existsSync(this.filePath)) {
+      log('data.json not found. Re-initializing with initial data.');
       this.initializeStore();
     }
   }
diff --git a/Composer/packages/server/src/utility/attachLSP.ts b/Composer/packages/server/src/utility/attachLSP.ts
new file mode 100644
index 0000000000..82e3ca58c8
--- /dev/null
+++ b/Composer/packages/server/src/utility/attachLSP.ts
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import * as http from 'http';
+import * as url from 'url';
+import * as net from 'net';
+
+import * as ws from 'ws';
+import * as rpc from 'vscode-ws-jsonrpc';
+
+export function createSocketHandler(webSocket: any): rpc.IWebSocket {
+  const socket: rpc.IWebSocket = {
+    send: content => webSocket.send(content),
+    onMessage: cb => webSocket.on('message', cb),
+    onError: cb => webSocket.on('error', cb),
+    onClose: cb => webSocket.on('close', cb),
+    dispose: () => webSocket.close(),
+  };
+  return socket;
+}
+
+export function attachLSPServer(wss: ws.Server, server: http.Server, path: string, handler: (webSocket) => void) {
+  server.on('upgrade', (request: http.IncomingMessage, socket: net.Socket, head: Buffer) => {
+    const pathname = request.url ? url.parse(request.url).pathname : undefined;
+    if (pathname === path) {
+      wss.handleUpgrade(request, socket, head, webSocket => {
+        handler(createSocketHandler(webSocket));
+      });
+    }
+  });
+}
diff --git a/Composer/packages/tools/language-servers/language-generation/.eslintrc.js b/Composer/packages/tools/language-servers/language-generation/.eslintrc.js
new file mode 100644
index 0000000000..76a2148af6
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['../../../../.eslintrc.react.js'],
+  parserOptions: {
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
+};
diff --git a/Composer/packages/tools/language-servers/language-generation/.gitignore b/Composer/packages/tools/language-servers/language-generation/.gitignore
new file mode 100644
index 0000000000..0437368d03
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/.gitignore
@@ -0,0 +1,3 @@
+/lib
+/demo/lib
+/demo/dist
\ No newline at end of file
diff --git a/Composer/packages/tools/language-servers/language-generation/README.md b/Composer/packages/tools/language-servers/language-generation/README.md
new file mode 100644
index 0000000000..97b658f271
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/README.md
@@ -0,0 +1,21 @@
+# Language-generation language server
+
+## firstly, build the Composer
+```
+yarn install
+```
+
+```
+yarn build
+```
+
+## How to start the demo
+
+#### 1. under language-generation directory, run
+```
+yarn start
+```
+
+### 2. go to code-editor directory
+
+start lgEditor demo, connect :5002/lg-language-server
diff --git a/Composer/packages/tools/language-servers/language-generation/__tests__/app.test.ts b/Composer/packages/tools/language-servers/language-generation/__tests__/app.test.ts
new file mode 100644
index 0000000000..980c0de87d
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/__tests__/app.test.ts
@@ -0,0 +1,149 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import fs from 'fs';
+
+import WebSocket from 'ws';
+
+import { startServer } from './helpers/server';
+
+const lgFile = fs.readFileSync(`${__dirname}/mocks/greeting.lg`, 'utf-8');
+const initializeParams = fs.readFileSync(`${__dirname}/mocks/initialize-params.json`, 'utf-8');
+
+const ws = new WebSocket('ws://localhost:50002/lg-language-server');
+
+type messageResolver = (data) => void;
+
+const subscribers: messageResolver[] = [];
+
+ws.on('message', data => {
+  const subscriber = subscribers.shift();
+  if (subscriber) {
+    subscriber(data);
+  }
+});
+
+function send(data, resolvers?: messageResolver[]): Promise<any> {
+  ws.send(data);
+  return new Promise(resolve => {
+    if (typeof resolvers === 'undefined') {
+      subscribers.push(data => {
+        resolve(data);
+      });
+      return;
+    }
+    if (resolvers.length === 0) {
+      resolve();
+      return;
+    }
+    let count = 0;
+    const readers = resolvers.map(resolver => {
+      return data => {
+        count++;
+        resolver(JSON.parse(data));
+        if (resolvers.length === count) {
+          resolve(JSON.parse(data));
+        }
+      };
+    });
+    subscribers.push(...readers);
+  });
+}
+
+function jsonEscape(str) {
+  return str
+    .replace(/\n/g, '\\n')
+    .replace(/\r/g, '\\r')
+    .replace(/\t/g, '\\t');
+}
+
+const content = jsonEscape(lgFile);
+
+describe('lg lsp server', () => {
+  const server = startServer();
+  beforeAll(async () => {
+    await new Promise(resolve => {
+      ws.on('open', () => {
+        resolve();
+      });
+    });
+  });
+
+  afterAll(async done => {
+    ws.close();
+    server.close();
+    done();
+  });
+  it('websocket should connect server', async () => {
+    await send(`{ "jsonrpc":"2.0","id":0,"method":"initialize","params": ${initializeParams} }`, [
+      response => {
+        expect(response.method).toEqual('window/logMessage');
+        expect(response.params.type).toEqual(4);
+      },
+      response => {
+        expect(response.id).toEqual(0);
+      },
+    ]);
+    // client initialized
+    await send(`{"jsonrpc":"2.0","method":"initialized","params":{}}`, []);
+    await send(
+      `{"jsonrpc":"2.0","method":"textDocument/didOpen","params": {"textDocument":{"uri":"inmemory://model/1","languageId":"botbuilderlg","version":2,"text": "${content}" }}}`,
+      []
+    );
+  });
+
+  it('initialize documents', async () => {
+    // initialize, check diagnostics
+    await send(`{"jsonrpc":"2.0","id":1,"method":"initializeDocuments","params":{"uri":"inmemory://model/1"}}`, [
+      response => {
+        expect(response.id).toEqual(1);
+      },
+      response => {
+        expect(response.method).toEqual('textDocument/publishDiagnostics');
+        expect(response.params.diagnostics.length).toEqual(0);
+      },
+    ]);
+  });
+
+  it('hover', async () => {
+    // didChange
+    await send(
+      `{"jsonrpc":"2.0","id":2,"method":"textDocument/hover","params":{"textDocument":{"uri":"inmemory://model/1"},"position":{"line":6,"character":6}}}`,
+      [
+        response => {
+          expect(response.id).toEqual(2);
+          expect(response.result.contents[0]).toEqual('-Good evening');
+        },
+      ]
+    );
+  });
+
+  it('didChange', async () => {
+    // didChange
+    const newContent = `${content}-@{G\\r\\n`;
+    const payload = `{"jsonrpc":"2.0","method":"textDocument/didChange","params":{"textDocument":{"uri":"inmemory://model/1","version":3},"contentChanges":[{"text": "${newContent}"}]}}`;
+    await send(payload, [
+      response => {
+        expect(response.method).toEqual('textDocument/publishDiagnostics');
+        expect(response.params.diagnostics.length).toEqual(0);
+      },
+    ]);
+  });
+
+  it('completion', async () => {
+    // completion,
+    // input G, should suggest Greeting*
+    const payload = `{"jsonrpc":"2.0","id":3,"method":"textDocument/completion","params":{"textDocument":{"uri":"inmemory://model/1"},"position":{"line":8,"character":4},"context":{"triggerKind":1}}}`;
+    await send(payload, [
+      response => {
+        expect(response.id).toEqual(3);
+        expect(
+          response.result.items
+            .slice(0, 3)
+            .map(item => item.label)
+            .join(',')
+        ).toEqual(['Greeting1', 'Greeting2', 'Greeting3'].join(','));
+      },
+    ]);
+  });
+});
diff --git a/Composer/packages/tools/language-servers/language-generation/__tests__/helpers/server.ts b/Composer/packages/tools/language-servers/language-generation/__tests__/helpers/server.ts
new file mode 100644
index 0000000000..89a4bf78ba
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/__tests__/helpers/server.ts
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import * as http from 'http';
+import * as url from 'url';
+import * as net from 'net';
+
+import * as ws from 'ws';
+import * as rpc from 'vscode-ws-jsonrpc';
+import { IConnection, createConnection } from 'vscode-languageserver';
+import express from 'express';
+
+import { LGServer } from '../../src';
+
+function createSocketHandler(webSocket: any): rpc.IWebSocket {
+  const socket: rpc.IWebSocket = {
+    send: content =>
+      webSocket.send(content, error => {
+        if (error) {
+          throw error;
+        }
+      }),
+    onMessage: cb => webSocket.on('message', cb),
+    onError: cb => webSocket.on('error', cb),
+    onClose: cb => webSocket.on('close', cb),
+    dispose: () => webSocket.close(),
+  };
+  return socket;
+}
+
+function attachLSPServer(wss: ws.Server, server: http.Server, path: string, handler: (webSocket) => void) {
+  server.on('upgrade', (request: http.IncomingMessage, socket: net.Socket, head: Buffer) => {
+    const pathname = request.url ? url.parse(request.url).pathname : undefined;
+    if (pathname === path) {
+      wss.handleUpgrade(request, socket, head, webSocket => {
+        const socketHandler = createSocketHandler(webSocket);
+        handler(socketHandler);
+      });
+    }
+  });
+}
+
+function launchLanguageServer(socket: rpc.IWebSocket) {
+  const reader = new rpc.WebSocketMessageReader(socket);
+  const writer = new rpc.WebSocketMessageWriter(socket);
+  const connection: IConnection = createConnection(reader, writer);
+  return new LGServer(connection);
+}
+
+export function startServer() {
+  // create the express application
+  const app = express();
+  // server the static content, i.e. index.html
+  app.use(express.static(__dirname));
+  // start the server
+  const server = app.listen(50002);
+
+  const wss: ws.Server = new ws.Server({
+    noServer: true,
+    perMessageDeflate: false,
+  });
+  attachLSPServer(wss, server, '/lg-language-server', webSocket => {
+    // const socketHandler = createSocketHandler(webSocket);
+
+    // launch language server when the web socket is opened
+    if (webSocket.readyState === webSocket.OPEN) {
+      const server = launchLanguageServer(webSocket);
+      server.start();
+    } else {
+      webSocket.on('open', () => {
+        const server = launchLanguageServer(webSocket);
+        server.start();
+      });
+    }
+  });
+  return server;
+}
diff --git a/Composer/packages/tools/language-servers/language-generation/__tests__/mocks/greeting.lg b/Composer/packages/tools/language-servers/language-generation/__tests__/mocks/greeting.lg
new file mode 100644
index 0000000000..97c91a4879
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/__tests__/mocks/greeting.lg
@@ -0,0 +1,8 @@
+# Greeting1
+-Good morning
+
+# Greeting2
+-Good afternoon
+
+# Greeting3
+-Good evening
diff --git a/Composer/packages/tools/language-servers/language-generation/__tests__/mocks/initialize-params.json b/Composer/packages/tools/language-servers/language-generation/__tests__/mocks/initialize-params.json
new file mode 100644
index 0000000000..c9cdfd678b
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/__tests__/mocks/initialize-params.json
@@ -0,0 +1,238 @@
+{
+  "rootPath": null,
+  "rootUri": null,
+  "capabilities": {
+    "workspace": {
+      "applyEdit": true,
+      "workspaceEdit": {
+        "documentChanges": true,
+        "resourceOperations": [
+          "create",
+          "rename",
+          "delete"
+        ],
+        "failureHandling": "textOnlyTransactional"
+      },
+      "didChangeConfiguration": {
+        "dynamicRegistration": true
+      },
+      "didChangeWatchedFiles": {
+        "dynamicRegistration": true
+      },
+      "symbol": {
+        "dynamicRegistration": true,
+        "symbolKind": {
+          "valueSet": [
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26
+          ]
+        }
+      },
+      "executeCommand": {
+        "dynamicRegistration": true
+      },
+      "configuration": true,
+      "workspaceFolders": true
+    },
+    "textDocument": {
+      "publishDiagnostics": {
+        "relatedInformation": true,
+        "tagSupport": true
+      },
+      "synchronization": {
+        "dynamicRegistration": true,
+        "willSave": true,
+        "willSaveWaitUntil": true,
+        "didSave": true
+      },
+      "completion": {
+        "dynamicRegistration": true,
+        "contextSupport": true,
+        "completionItem": {
+          "snippetSupport": true,
+          "commitCharactersSupport": true,
+          "documentationFormat": [
+            "markdown",
+            "plaintext"
+          ],
+          "deprecatedSupport": true,
+          "preselectSupport": true
+        },
+        "completionItemKind": {
+          "valueSet": [
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25
+          ]
+        }
+      },
+      "hover": {
+        "dynamicRegistration": true,
+        "contentFormat": [
+          "markdown",
+          "plaintext"
+        ]
+      },
+      "signatureHelp": {
+        "dynamicRegistration": true,
+        "signatureInformation": {
+          "documentationFormat": [
+            "markdown",
+            "plaintext"
+          ],
+          "parameterInformation": {
+            "labelOffsetSupport": true
+          }
+        }
+      },
+      "definition": {
+        "dynamicRegistration": true,
+        "linkSupport": true
+      },
+      "references": {
+        "dynamicRegistration": true
+      },
+      "documentHighlight": {
+        "dynamicRegistration": true
+      },
+      "documentSymbol": {
+        "dynamicRegistration": true,
+        "symbolKind": {
+          "valueSet": [
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26
+          ]
+        },
+        "hierarchicalDocumentSymbolSupport": true
+      },
+      "codeAction": {
+        "dynamicRegistration": true,
+        "codeActionLiteralSupport": {
+          "codeActionKind": {
+            "valueSet": [
+              "",
+              "quickfix",
+              "refactor",
+              "refactor.extract",
+              "refactor.inline",
+              "refactor.rewrite",
+              "source",
+              "source.organizeImports"
+            ]
+          }
+        }
+      },
+      "codeLens": {
+        "dynamicRegistration": true
+      },
+      "formatting": {
+        "dynamicRegistration": true
+      },
+      "rangeFormatting": {
+        "dynamicRegistration": true
+      },
+      "onTypeFormatting": {
+        "dynamicRegistration": true
+      },
+      "rename": {
+        "dynamicRegistration": true,
+        "prepareSupport": true
+      },
+      "documentLink": {
+        "dynamicRegistration": true
+      },
+      "typeDefinition": {
+        "dynamicRegistration": true,
+        "linkSupport": true
+      },
+      "implementation": {
+        "dynamicRegistration": true,
+        "linkSupport": true
+      },
+      "colorProvider": {
+        "dynamicRegistration": true
+      },
+      "foldingRange": {
+        "dynamicRegistration": true,
+        "rangeLimit": 5000,
+        "lineFoldingOnly": true
+      },
+      "declaration": {
+        "dynamicRegistration": true,
+        "linkSupport": true
+      }
+    }
+  },
+  "trace": "off",
+  "workspaceFolders": null
+}
diff --git a/Composer/packages/tools/language-servers/language-generation/demo/.eslintrc.js b/Composer/packages/tools/language-servers/language-generation/demo/.eslintrc.js
new file mode 100644
index 0000000000..328b328945
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/demo/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  extends: ['../../../../../.eslintrc.react.js'],
+  parserOptions: {
+    project: './tsconfig.json',
+    tsconfigRootDir: __dirname,
+  },
+};
diff --git a/Composer/packages/tools/language-servers/language-generation/demo/src/attach.ts b/Composer/packages/tools/language-servers/language-generation/demo/src/attach.ts
new file mode 100644
index 0000000000..82e3ca58c8
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/demo/src/attach.ts
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import * as http from 'http';
+import * as url from 'url';
+import * as net from 'net';
+
+import * as ws from 'ws';
+import * as rpc from 'vscode-ws-jsonrpc';
+
+export function createSocketHandler(webSocket: any): rpc.IWebSocket {
+  const socket: rpc.IWebSocket = {
+    send: content => webSocket.send(content),
+    onMessage: cb => webSocket.on('message', cb),
+    onError: cb => webSocket.on('error', cb),
+    onClose: cb => webSocket.on('close', cb),
+    dispose: () => webSocket.close(),
+  };
+  return socket;
+}
+
+export function attachLSPServer(wss: ws.Server, server: http.Server, path: string, handler: (webSocket) => void) {
+  server.on('upgrade', (request: http.IncomingMessage, socket: net.Socket, head: Buffer) => {
+    const pathname = request.url ? url.parse(request.url).pathname : undefined;
+    if (pathname === path) {
+      wss.handleUpgrade(request, socket, head, webSocket => {
+        handler(createSocketHandler(webSocket));
+      });
+    }
+  });
+}
diff --git a/Composer/packages/tools/language-servers/language-generation/demo/src/server.ts b/Composer/packages/tools/language-servers/language-generation/demo/src/server.ts
new file mode 100644
index 0000000000..1e119654bc
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/demo/src/server.ts
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+// import { attachLSPServer } from '../../src/attachWSToHTTPServer';
+import * as ws from 'ws';
+import * as rpc from 'vscode-ws-jsonrpc';
+import { IConnection, createConnection } from 'vscode-languageserver';
+
+import { LGServer } from '../../src';
+
+import { attachLSPServer } from './attach';
+
+const express = require('express');
+
+// create the express application
+const app = express();
+// server the static content, i.e. index.html
+app.use(express.static(__dirname));
+// start the server
+const server = app.listen(5002);
+
+const wss: ws.Server = new ws.Server({
+  noServer: true,
+  perMessageDeflate: false,
+});
+
+function launchLanguageServer(socket: rpc.IWebSocket) {
+  const reader = new rpc.WebSocketMessageReader(socket);
+  const writer = new rpc.WebSocketMessageWriter(socket);
+  const connection: IConnection = createConnection(reader, writer);
+  const server = new LGServer(connection);
+  server.start();
+  return server;
+}
+
+attachLSPServer(wss, server, '/lg-language-server', webSocket => {
+  if (webSocket.readyState === webSocket.OPEN) {
+    launchLanguageServer(webSocket);
+  } else {
+    webSocket.on('open', () => {
+      launchLanguageServer(webSocket);
+    });
+  }
+});
diff --git a/Composer/packages/tools/language-servers/language-generation/demo/tsconfig.json b/Composer/packages/tools/language-servers/language-generation/demo/tsconfig.json
new file mode 100644
index 0000000000..715831d5b4
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/demo/tsconfig.json
@@ -0,0 +1,10 @@
+{
+    "extends": "../tsconfig.json",
+    "include": [
+        "./src/**/*",
+        "./__tests__/**/*"
+    ],
+    "exclude": [
+        "node_modules"
+    ],
+}
\ No newline at end of file
diff --git a/Composer/packages/tools/language-servers/language-generation/jest.config.js b/Composer/packages/tools/language-servers/language-generation/jest.config.js
new file mode 100644
index 0000000000..347f13c8a5
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/jest.config.js
@@ -0,0 +1,15 @@
+const path = require('path');
+
+module.exports = {
+  preset: 'ts-jest/presets/js-with-babel',
+  testPathIgnorePatterns: ['/node_modules/', '/helpers/', '/mocks/'],
+  watchPathIgnorePatterns: ['<rootDir>/__tests__/mocks'],
+  globals: {
+    'ts-jest': {
+      tsConfig: path.resolve(__dirname, './tsconfig.json'),
+      diagnostics: {
+        warnOnly: true,
+      },
+    },
+  },
+};
diff --git a/Composer/packages/tools/language-servers/language-generation/package.json b/Composer/packages/tools/language-servers/language-generation/package.json
new file mode 100644
index 0000000000..10e073ed36
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "@bfc/lg-languageserver",
+  "version": "0.1.0",
+  "main": "lib/index.js",
+  "scripts": {
+    "build": "tsc --build tsconfig.build.json",
+    "build:demo": "cd demo && tsc --build tsconfig.json",
+    "prepublishOnly": "npm run build",
+    "clean": "rimraf lib demo/dist",
+    "start": "cd demo && ts-node ./src/server.ts",
+    "test": "jest",
+    "lint": "eslint --quiet --ext .js,.jsx,.ts,.tsx ./src ./__tests__",
+    "lint:fix": "yarn lint --fix",
+    "lint:typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@types/node": "^12.0.4",
+    "botbuilder-lg": "https://botbuilder.myget.org/F/botbuilder-declarative/npm/botbuilder-lg/-/4.7.0-preview2.tgz",
+    "request-light": "^0.2.2",
+    "vscode-languageserver": "^5.3.0-next"
+  },
+  "devDependencies": {
+    "express": "^4.17.1",
+    "jest": "24.0.0",
+    "rimraf": "^2.6.3",
+    "ts-jest": "^24.1.0",
+    "ts-node": "^8.3.0",
+    "typescript": "^3.6.3",
+    "vscode-ws-jsonrpc": "^0.1.1",
+    "ws": "^7.2.0"
+  }
+}
diff --git a/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts b/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts
new file mode 100644
index 0000000000..4f5c6da8f0
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/src/LGServer.ts
@@ -0,0 +1,362 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { readFile } from 'fs';
+
+import { xhr, getErrorStatusDescription } from 'request-light';
+import URI from 'vscode-uri';
+import { IConnection, TextDocuments } from 'vscode-languageserver';
+import {
+  TextDocument,
+  Diagnostic,
+  CompletionList,
+  Hover,
+  CompletionItemKind,
+  CompletionItem,
+  Range,
+} from 'vscode-languageserver-types';
+import { TextDocumentPositionParams } from 'vscode-languageserver-protocol';
+import get from 'lodash/get';
+import { LGTemplate } from 'botbuilder-lg';
+
+import { buildInfunctionsMap } from './builtinFunctionsMap';
+import {
+  getRangeAtPosition,
+  getLGResources,
+  updateTemplateInContent,
+  getTemplatePositionOffset,
+  LGDocument,
+  checkText,
+  checkTemplate,
+  convertDiagnostics,
+  isValid,
+} from './utils';
+
+// define init methods call from client
+const InitializeDocumentsMethodName = 'initializeDocuments';
+
+const allowedCompletionStates = ['expression'];
+
+export class LGServer {
+  protected workspaceRoot?: URI;
+  protected readonly documents = new TextDocuments();
+  protected readonly pendingValidationRequests = new Map<string, number>();
+  protected LGDocuments: LGDocument[] = []; // LG Documents Store
+
+  constructor(protected readonly connection: IConnection) {
+    this.documents.listen(this.connection);
+    this.documents.onDidChangeContent(change => this.validate(change.document));
+    this.documents.onDidClose(event => {
+      this.cleanPendingValidation(event.document);
+      this.cleanDiagnostics(event.document);
+    });
+
+    this.connection.onInitialize(params => {
+      if (params.rootPath) {
+        this.workspaceRoot = URI.file(params.rootPath);
+      } else if (params.rootUri) {
+        this.workspaceRoot = URI.parse(params.rootUri);
+      }
+      this.connection.console.log('The server is initialized.');
+      return {
+        capabilities: {
+          textDocumentSync: this.documents.syncKind,
+          codeActionProvider: false,
+          completionProvider: {
+            resolveProvider: true,
+          },
+          hoverProvider: true,
+          foldingRangeProvider: false,
+        },
+      };
+    });
+    this.connection.onCompletion(params => this.completion(params));
+    this.connection.onHover(params => this.hover(params));
+
+    this.connection.onRequest((method, params) => {
+      if (InitializeDocumentsMethodName === method) {
+        const { uri, inline = false, content, template } = params;
+        this.LGDocuments.push({ uri, inline, content, template });
+        // run diagnostic
+        const textDocument = this.documents.get(uri);
+        if (textDocument) {
+          this.validate(textDocument);
+        }
+      }
+    });
+  }
+
+  start() {
+    this.connection.listen();
+  }
+
+  protected getLGDocument(document: TextDocument): LGDocument | undefined {
+    return this.LGDocuments.find(({ uri }) => uri === document.uri);
+  }
+  protected getLGDocumentContent(document: TextDocument): string {
+    const LGDocument = this.LGDocuments.find(item => item.uri === document.uri);
+    const text = document.getText();
+    if (LGDocument && LGDocument.inline) {
+      const { content, template } = LGDocument;
+      if (!content || !template) return text;
+      const updatedTemplate = {
+        Name: template.Name,
+        Parameters: template.Parameters,
+        Body: text,
+      };
+
+      const templateDiags = checkTemplate(updatedTemplate);
+      // error in template.
+      if (isValid(templateDiags) === false) {
+        const diagnostics = convertDiagnostics(templateDiags, document);
+        this.sendDiagnostics(document, diagnostics);
+        return content;
+
+        // error in document context
+      } else {
+        return updateTemplateInContent(content, updatedTemplate);
+      }
+    }
+    return text;
+  }
+
+  protected hover(params: TextDocumentPositionParams): Thenable<Hover | null> {
+    const document = this.documents.get(params.textDocument.uri);
+    if (!document) {
+      return Promise.resolve(null);
+    }
+    const text = this.getLGDocumentContent(document);
+    const lgResources = getLGResources(text);
+    const templates = lgResources.Templates;
+    const wordRange = getRangeAtPosition(document, params.position);
+    let word = document.getText(wordRange);
+    const matchItem = templates.find(u => u.Name === word);
+    if (matchItem) {
+      const hoveritem: Hover = { contents: [matchItem.Body] };
+      return Promise.resolve(hoveritem);
+    }
+    if (word.startsWith('builtin.')) {
+      word = word.substring(8);
+    }
+
+    if (buildInfunctionsMap.has(word)) {
+      const functionEntity = buildInfunctionsMap.get(word);
+      if (!functionEntity) {
+        return Promise.resolve(null);
+      }
+      const hoveritem: Hover = {
+        contents: [
+          `Parameters: ${get(functionEntity, 'Params', []).join(', ')}`,
+          `Documentation: ${get(functionEntity, 'Introduction', '')}`,
+          `ReturnType: ${get(functionEntity, 'Returntype', '').valueOf()}`,
+        ],
+      };
+      return Promise.resolve(hoveritem);
+    }
+    return Promise.resolve(null);
+  }
+
+  protected async resolveSchema(url: string): Promise<string> {
+    const uri = URI.parse(url);
+    if (uri.scheme === 'file') {
+      return new Promise<string>((resolve, reject) => {
+        // eslint-disable-next-line security/detect-non-literal-fs-filename
+        readFile(uri.fsPath, 'UTF-8', (err, result) => {
+          err ? reject('') : resolve(result.toString());
+        });
+      });
+    }
+    try {
+      const response = await xhr({ url, followRedirects: 5 });
+      return response.responseText;
+    } catch (error) {
+      return Promise.reject(error.responseText || getErrorStatusDescription(error.status) || error.toString());
+    }
+  }
+
+  private removeParamFormat(params: string): string {
+    const resultArr = params.split(',').map(element => {
+      return element.trim().split(':')[0];
+    });
+    return resultArr.join(' ,');
+  }
+
+  private matchedStates(params: TextDocumentPositionParams): { matched: boolean; state: string } | null {
+    const state: string[] = [];
+    const document = this.documents.get(params.textDocument.uri);
+    if (!document) return null;
+    const position = params.position;
+    const range = Range.create(position.line, 0, position.line, position.character);
+    const lineContent = document.getText(range);
+    if (!lineContent.trim().startsWith('-')) {
+      return { matched: false, state: '' };
+    }
+
+    //initialize the root state to plaintext
+    state.push('PlainText');
+
+    // find out the context state of current cursor, offer precise suggestion and completion etc.
+    /**
+     * - Hi, @{name}, what's the meaning of 'state'
+     * - Hi---------, @{name}--------, what-------' ------s the meaning of "state"
+     * - <plaintext>, @{<expression>}, <plaintext><single><plaintext>------<double>
+     */
+    let i = 0;
+    while (i < lineContent.length) {
+      const char = lineContent.charAt(i);
+      if (char === `'`) {
+        if (state[state.length - 1] === 'expression' || state[state.length - 1] === 'double') {
+          state.push('single');
+        } else {
+          state.pop();
+        }
+      }
+
+      if (char === `"`) {
+        if (state[state.length - 1] === 'expression' || state[state.length - 1] === 'single') {
+          state.push('double');
+        } else {
+          state.pop();
+        }
+      }
+
+      if (char === '{' && i >= 1 && state[state.length - 1] !== 'single' && state[state.length - 1] !== 'double') {
+        if (lineContent.charAt(i - 1) === '@') {
+          state.push('expression');
+        }
+      }
+
+      if (char === '}' && state[state.length - 1] === 'expression') {
+        state.pop();
+      }
+      i++;
+    }
+    const finalState = state[state.length - 1];
+    return { matched: true, state: finalState };
+  }
+
+  protected completion(params: TextDocumentPositionParams): Thenable<CompletionList | null> {
+    const document = this.documents.get(params.textDocument.uri);
+    if (!document) {
+      return Promise.resolve(null);
+    }
+    const text = this.getLGDocumentContent(document);
+    let templates: LGTemplate[] = [];
+
+    const diags = checkText(text);
+
+    if (isValid(diags) === false) {
+      return Promise.resolve(null);
+    }
+
+    const lgResources = getLGResources(text);
+    templates = lgResources.Templates;
+
+    const completionTemplateList: CompletionItem[] = templates.map(template => {
+      return {
+        label: template.Name,
+        kind: CompletionItemKind.Reference,
+        insertText:
+          template.Parameters.length > 0 ? template.Name + '(' + template.Parameters.join(', ') + ')' : template.Name,
+        documentation: template.Body,
+      };
+    });
+
+    const completionFunctionList: CompletionItem[] = Array.from(buildInfunctionsMap).map(item => {
+      const [key, value] = item;
+      return {
+        label: key,
+        kind: CompletionItemKind.Function,
+        insertText: key + '(' + this.removeParamFormat(value.Params.toString()) + ')',
+        documentation: value.Introduction,
+      };
+    });
+
+    const completionList = completionTemplateList.concat(completionFunctionList);
+
+    const matchResult = this.matchedStates(params);
+    // TODO: more precise match
+    if (
+      matchResult &&
+      matchResult.matched &&
+      matchResult.state &&
+      allowedCompletionStates.includes(matchResult.state.toLowerCase())
+    ) {
+      return Promise.resolve({ isIncomplete: true, items: completionList });
+    } else {
+      return Promise.resolve(null);
+    }
+  }
+
+  protected validate(document: TextDocument): void {
+    this.cleanPendingValidation(document);
+    this.pendingValidationRequests.set(
+      document.uri,
+      setTimeout(() => {
+        this.pendingValidationRequests.delete(document.uri);
+        this.doValidate(document);
+      })
+    );
+  }
+
+  protected cleanPendingValidation(document: TextDocument): void {
+    const request = this.pendingValidationRequests.get(document.uri);
+    if (typeof request !== 'undefined') {
+      clearTimeout(request);
+      this.pendingValidationRequests.delete(document.uri);
+    }
+  }
+
+  protected doValidate(document: TextDocument): void {
+    let text = document.getText();
+    let lineOffset = 0;
+    const LGDocument = this.getLGDocument(document);
+
+    // uninitialized
+    if (!LGDocument) {
+      return;
+    }
+
+    // if inline editor, concat new content for validate
+    if (LGDocument.inline) {
+      const { content, template } = LGDocument;
+      if (!content || !template) return;
+      const updatedTemplate = {
+        Name: template.Name,
+        Parameters: template.Parameters,
+        Body: text,
+      };
+
+      const templateDiags = checkTemplate(updatedTemplate);
+      // error in template.
+      if (isValid(templateDiags) === false) {
+        const diagnostics = convertDiagnostics(templateDiags, document);
+        this.sendDiagnostics(document, diagnostics);
+        return;
+      } else {
+        text = updateTemplateInContent(content, updatedTemplate);
+        lineOffset = getTemplatePositionOffset(content, updatedTemplate);
+      }
+    }
+
+    if (text.length === 0) {
+      this.cleanDiagnostics(document);
+      return;
+    }
+
+    const lgDiagnostics = checkText(text);
+    const diagnostics = convertDiagnostics(lgDiagnostics, document, lineOffset);
+    this.sendDiagnostics(document, diagnostics);
+  }
+
+  protected cleanDiagnostics(document: TextDocument): void {
+    this.sendDiagnostics(document, []);
+  }
+
+  protected sendDiagnostics(document: TextDocument, diagnostics: Diagnostic[]): void {
+    this.connection.sendDiagnostics({
+      uri: document.uri,
+      diagnostics,
+    });
+  }
+}
diff --git a/Composer/packages/tools/language-servers/language-generation/src/builtinFunctionsMap.ts b/Composer/packages/tools/language-servers/language-generation/src/builtinFunctionsMap.ts
new file mode 100644
index 0000000000..96af98d82e
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/src/builtinFunctionsMap.ts
@@ -0,0 +1,720 @@
+/**
+ * @module botbuilder-lg-LSP
+ */
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { ReturnType } from 'botbuilder-expression';
+export class FunctionEntity {
+  public constructor(params: string[], returntype: ReturnType, introduction: string) {
+    this.Params = params;
+    this.Returntype = returntype;
+    this.Introduction = introduction;
+  }
+  public Params: string[];
+  public Returntype: ReturnType;
+  public Introduction: string;
+}
+
+// todo should add params info and other info og the function
+export const buildInfunctionsMap: Map<string, FunctionEntity> = new Map<string, FunctionEntity>([
+  [
+    'add',
+    new FunctionEntity(
+      ['num1: number', 'num2: number'],
+      ReturnType.Number,
+      'Return the result from adding two numbers.'
+    ),
+  ],
+  [
+    'div',
+    new FunctionEntity(
+      ['dividend: number', 'divisor: number'],
+      ReturnType.Number,
+      'Return the integer result from dividing two numbers. To get the remainder result, see mod().'
+    ),
+  ],
+  [
+    'mod',
+    new FunctionEntity(
+      ['dividend: number', 'divisor: number'],
+      ReturnType.Number,
+      'Return the remainder from dividing two numbers. To get the integer result, see div().'
+    ),
+  ],
+  [
+    'mul',
+    new FunctionEntity(
+      ['multiplicand1: number', 'multiplicand2: number'],
+      ReturnType.Number,
+      'Return the product from multiplying two numbers.'
+    ),
+  ],
+  [
+    'sub',
+    new FunctionEntity(
+      ['minuend: number', 'subtrahend: number'],
+      ReturnType.Number,
+      'Return the result from subtracting the second number from the first number.'
+    ),
+  ],
+  [
+    'exp',
+    new FunctionEntity(
+      ['minuend: number', 'subtrahend: number'],
+      ReturnType.Number,
+      'Return exponentiation of one number to another.'
+    ),
+  ],
+  [
+    'concat',
+    new FunctionEntity(
+      ['...strings: string[]'],
+      ReturnType.String,
+      'Combine two or more strings and return the resulting string. E.g. concat(‘hello’, ‘world’, ‘…’)'
+    ),
+  ],
+  [
+    'not',
+    new FunctionEntity(
+      ['expression: bool'],
+      ReturnType.Boolean,
+      'Check whether an expression is false. Return true when the expression is false, or return false when true.'
+    ),
+  ],
+  [
+    'and',
+    new FunctionEntity(
+      ['...input: any[]'],
+      ReturnType.Boolean,
+      'Check whether all expressions are true. Return true when all expressions are true, or return false when at least one expression is false.'
+    ),
+  ],
+  [
+    'or',
+    new FunctionEntity(
+      ['...input: any[]'],
+      ReturnType.Boolean,
+      'Check whether at least one expression is true. Return true when at least one expression is true, or return false when all are false.'
+    ),
+  ],
+  [
+    'equals',
+    new FunctionEntity(
+      ['...input: any[]'],
+      ReturnType.Boolean,
+      'Comparison equal. Returns true if specified values are equal'
+    ),
+  ],
+  [
+    'greater',
+    new FunctionEntity(
+      ['value: any', 'compareTo: any'],
+      ReturnType.Boolean,
+      'Check whether the first value is greater than the second value. Return true when the first value is more, or return false when less.'
+    ),
+  ],
+  [
+    'greaterOrEquals',
+    new FunctionEntity(
+      ['value: any', 'compareTo: any'],
+      ReturnType.Boolean,
+      'Check whether the first value is greater than or equal to the second value. Return true when the first value is greater or equal, or return false when the first value is less.'
+    ),
+  ],
+  [
+    'less',
+    new FunctionEntity(
+      ['value: any', 'compareTo: any'],
+      ReturnType.Boolean,
+      'Check whether the first value is less than the second value. Return true when the first value is less, or return false when the first value is more.'
+    ),
+  ],
+  [
+    'lessOrEquals',
+    new FunctionEntity(
+      ['value: any', 'compareTo: any'],
+      ReturnType.Boolean,
+      'Check whether the first value is less than or equal to the second value. Return true when the first value is less than or equal, or return false when the first value is more.'
+    ),
+  ],
+  [
+    'join',
+    new FunctionEntity(
+      ['collection: Array', 'delimiter: string'],
+      ReturnType.String,
+      'Return a string that has all the items from an array and has each character separated by a delimiter.'
+    ),
+  ],
+  ['empty', new FunctionEntity(['collection: any'], ReturnType.Boolean, 'Check if the collection is empty')],
+  ['newGuid', new FunctionEntity([], ReturnType.String, 'Return new guid string')],
+  [
+    'min',
+    new FunctionEntity(['...numbers: number[]'], ReturnType.Number, 'Returns the smallest value from a collection'),
+  ],
+  [
+    'max',
+    new FunctionEntity(['...numbers: number[]'], ReturnType.Number, 'Returns the largest value from a collection'),
+  ],
+  [
+    'average',
+    new FunctionEntity(['...numbers: number[]'], ReturnType.Number, 'Returns the average value from a collection'),
+  ],
+  [
+    'sum',
+    new FunctionEntity(['...numbers: number[]'], ReturnType.Number, 'Return the result from adding numbers in a list.'),
+  ],
+  [
+    'exists',
+    new FunctionEntity(['expression: expression'], ReturnType.Boolean, 'Returns the smallest value from a collection'),
+  ],
+  ['length', new FunctionEntity(['str: string'], ReturnType.Number, 'Returns the length of a string')],
+  [
+    'replace',
+    new FunctionEntity(
+      ['text: string', 'oldText: string', 'newText: string'],
+      ReturnType.String,
+      'Replace a substring with the specified string, and return the updated string. case sensitive'
+    ),
+  ],
+  [
+    'replaceIgnoreCase',
+    new FunctionEntity(
+      ['text: string', 'oldText: string', 'newText: string'],
+      ReturnType.String,
+      'Replace a substring with the specified string, and return the updated string. Case in-sensitive'
+    ),
+  ],
+  [
+    'split',
+    new FunctionEntity(
+      ['text: string', 'delimiter: string'],
+      ReturnType.Object,
+      'Returns an array that contains substrings based on the delimiter specified.'
+    ),
+  ],
+  [
+    'substring',
+    new FunctionEntity(
+      ['text: string', 'startIndex: number', 'length?: number'],
+      ReturnType.String,
+      'Returns characters from a string. Substring(sourceString, startPos, endPos). startPos cannot be less than 0. endPos greater than source strings length will be taken as the max length of the string'
+    ),
+  ],
+  ['toLower', new FunctionEntity(['text: string'], ReturnType.String, 'Convert a string to all upper case characters')],
+  ['toUpper', new FunctionEntity(['text: string'], ReturnType.String, 'Convert a string to all lower case characters')],
+  [
+    'trim',
+    new FunctionEntity(['text: string'], ReturnType.String, 'Remove leading and trailing white spaces from a string'),
+  ],
+  [
+    'count',
+    new FunctionEntity(
+      ['collection: string|Array'],
+      ReturnType.Number,
+      'Returns the number of items in the collection'
+    ),
+  ],
+  [
+    'contains',
+    new FunctionEntity(
+      ['collection: stirng|Array|Map', 'value: stirng|Array|Map'],
+      ReturnType.Boolean,
+      'Works to find an item in a string or to find an item in an array or to find a parameter in a complex object. E.g. contains(‘hello world, ‘hello); contains([‘1’, ‘2’], ‘1’); contains({“foo”:”bar”}, “foo”)'
+    ),
+  ],
+  [
+    'join',
+    new FunctionEntity(
+      ['collection: Array', 'delimiter: string'],
+      ReturnType.String,
+      'Return a string that has all the items from an array and has each character separated by a delimiter.'
+    ),
+  ],
+  [
+    'first',
+    new FunctionEntity(['collection: string|Array'], ReturnType.Object, 'Returns the first item from the collection'),
+  ],
+  [
+    'last',
+    new FunctionEntity(['collection: string|Array'], ReturnType.Object, 'Returns the last item from the collection'),
+  ],
+  [
+    'foreach',
+    new FunctionEntity(
+      ['collection: Array', 'iteratorName: string', 'function: any'],
+      ReturnType.Object,
+      'Operate on each element and return the new collection'
+    ),
+  ],
+  [
+    'addDays',
+    new FunctionEntity(
+      ['timestamp: string', 'days: number', 'format?: string'],
+      ReturnType.String,
+      'Add number of specified days to a given timestamp'
+    ),
+  ],
+  [
+    'addHours',
+    new FunctionEntity(
+      ['timestamp: string', 'hours: number', 'format?: string'],
+      ReturnType.String,
+      'Add specified number of hours to a given timestamp'
+    ),
+  ],
+  [
+    'addMinutes',
+    new FunctionEntity(
+      ['timestamp: string', 'minutes: number', 'format?: string'],
+      ReturnType.String,
+      'Add specified number of minutes to a given timestamp'
+    ),
+  ],
+  [
+    'addSeconds',
+    new FunctionEntity(
+      ['timestamp: string', 'seconds: number', 'format?: string'],
+      ReturnType.String,
+      'Add specified number of seconds to a given timestamp'
+    ),
+  ],
+  [
+    'dayOfMonth',
+    new FunctionEntity(
+      ['timestamp: string'],
+      ReturnType.Number,
+      'Returns day of month for a given timestamp or timex expression.'
+    ),
+  ],
+  [
+    'dayOfWeek',
+    new FunctionEntity(['timestamp: string'], ReturnType.Number, 'Return the day of the week from a timestamp.'),
+  ],
+  [
+    'dayOfYear',
+    new FunctionEntity(['timestamp: string'], ReturnType.Number, 'Return the day of the year from a timestamp.'),
+  ],
+  ['month', new FunctionEntity(['timestamp: string'], ReturnType.Number, 'Returns the month of given timestamp')],
+  [
+    'date',
+    new FunctionEntity(
+      ['timestamp: string'],
+      ReturnType.Number,
+      'Return the date of a specified timestamp in "M/dd/yyyy" format.'
+    ),
+  ],
+  ['year', new FunctionEntity(['timestamp: string'], ReturnType.Number, 'Returns year for the given timestamp')],
+  ['utcNow', new FunctionEntity(['format?: string'], ReturnType.String, 'Returns current timestamp as string')],
+  [
+    'formatDateTime',
+    new FunctionEntity(
+      ['timestamp: string', 'format?: string'],
+      ReturnType.String,
+      'Return a timestamp in the specified format.'
+    ),
+  ],
+  [
+    'subtractFromTime',
+    new FunctionEntity(
+      ['timestamp: string', 'interval: number', 'timeUnit: string', 'format?: string'],
+      ReturnType.String,
+      'Subtract a number of time units from a timestamp.'
+    ),
+  ],
+  [
+    'dateReadBack',
+    new FunctionEntity(
+      ['currentDate: string', 'targetDate: string'],
+      ReturnType.String,
+      'Uses the date-time library to provide a date readback. dateReadBack(currentDate, targetDate). E.g. dateReadBack(‘2016/05/30’,’2016/05/23’)=>"Yesterday"'
+    ),
+  ],
+  [
+    'getTimeOfDay',
+    new FunctionEntity(
+      ['timestamp: string'],
+      ReturnType.String,
+      'Returns time of day for a given timestamp (midnight = 12AM, morning = 12:01AM – 11:59PM, noon = 12PM, afternoon = 12:01PM -05:59PM, evening = 06:00PM – 10:00PM, night = 10:01PM – 11:59PM)'
+    ),
+  ],
+  [
+    'float',
+    new FunctionEntity(
+      ['value: string'],
+      ReturnType.Number,
+      'Return floating point representation of the specified string or the string itself if conversion is not possible'
+    ),
+  ],
+  [
+    'int',
+    new FunctionEntity(
+      ['value: string'],
+      ReturnType.Number,
+      'Return integer representation of the specified string or the string itself if conversion is not possible'
+    ),
+  ],
+  ['string', new FunctionEntity(['value: any'], ReturnType.String, 'Return string version of the specified value')],
+  [
+    'bool',
+    new FunctionEntity(
+      ['value: any'],
+      ReturnType.Boolean,
+      'Return Boolean representation of the specified string. Bool(‘true’), bool(1)'
+    ),
+  ],
+  ['createArray', new FunctionEntity(['...objects: any[]'], ReturnType.Object, 'Create an array from multiple inputs')],
+  [
+    'if',
+    new FunctionEntity(
+      ['expression: boolean', 'valueIfTrue: any', 'valueIfFalse: any'],
+      ReturnType.Object,
+      'if(exp, valueIfTrue, valueIfFalse)'
+    ),
+  ],
+  [
+    'rand',
+    new FunctionEntity(
+      ['minValue: number', 'maxValue: number'],
+      ReturnType.Number,
+      'Returns a random number between specified min and max value – rand(<minValue>, <maxValue>)'
+    ),
+  ],
+  [
+    'json',
+    new FunctionEntity(
+      ['value: string|XML'],
+      ReturnType.String,
+      'Return the JavaScript Object Notation (JSON) type value or object for a string or XML.'
+    ),
+  ],
+  [
+    'getProperty',
+    new FunctionEntity(
+      ['jsobObject: any', 'property: string'],
+      ReturnType.Object,
+      'Return the value of the given property in a JSON object.'
+    ),
+  ],
+  [
+    'addProperty',
+    new FunctionEntity(
+      ['jsobObject: any', 'property: string', 'value: any'],
+      ReturnType.Object,
+      'Add a property and its value, or name-value pair, to a JSON object, and return the updated object. If the object already exists at runtime, the function throws an error.'
+    ),
+  ],
+  [
+    'removeProperty',
+    new FunctionEntity(
+      ['jsobObject: any', 'property: string'],
+      ReturnType.Object,
+      'Remove a property from an object and return the updated object.'
+    ),
+  ],
+  [
+    'setProperty',
+    new FunctionEntity(
+      ['jsobObject: any', 'property: string', 'value: any'],
+      ReturnType.Object,
+      "Set the value for an object's property and return the updated object. To add a new property, you can use this function or the addProperty() function."
+    ),
+  ],
+  [
+    'endsWith',
+    new FunctionEntity(
+      ['text: string', 'value: string'],
+      ReturnType.Boolean,
+      'Return if a text is end with another string'
+    ),
+  ],
+  [
+    'startsWith',
+    new FunctionEntity(
+      ['text: string', 'value: string'],
+      ReturnType.Boolean,
+      'Return if a text is end with another string'
+    ),
+  ],
+  ['countWord', new FunctionEntity(['text: string'], ReturnType.Number, 'Returns the word count')],
+  ['addOrdinal', new FunctionEntity(['num: number'], ReturnType.String, 'e.g. addOrdinal(10) = 10th')],
+  [
+    'indexOf',
+    new FunctionEntity(
+      ['text: string', 'value: string'],
+      ReturnType.Number,
+      'Returns the index of the value from the text'
+    ),
+  ],
+  [
+    'lastIndexOf',
+    new FunctionEntity(
+      ['text: string', 'value: string'],
+      ReturnType.Number,
+      'Returns the last index of the value from the text'
+    ),
+  ],
+  [
+    'union',
+    new FunctionEntity(
+      ['...values: Array[]'],
+      ReturnType.Object,
+      'Produces the set union of two sequences by using the default equality comparer.'
+    ),
+  ],
+  [
+    'intersection',
+    new FunctionEntity(
+      ['...values: Array[]'],
+      ReturnType.Object,
+      ' Produces the set intersection of two sequences by using the default equality comparer to compare values.'
+    ),
+  ],
+  [
+    'skip',
+    new FunctionEntity(
+      ['array: Array', 'length: number'],
+      ReturnType.Object,
+      'Bypasses a specified number of elements in a sequence and then returns the remaining elements.'
+    ),
+  ],
+  [
+    'take',
+    new FunctionEntity(
+      ['array: Array', 'length: number'],
+      ReturnType.Object,
+      'Returns a specified number of contiguous elements from the start of a sequence.'
+    ),
+  ],
+  [
+    'subArray',
+    new FunctionEntity(
+      ['array: Array', 'startIndex: number', 'endIndex: number'],
+      ReturnType.Object,
+      'Returns the sub array from start index to end index'
+    ),
+  ],
+  ['array', new FunctionEntity(['value: any'], ReturnType.Object, 'Create a new array with single value ')],
+  ['binary', new FunctionEntity(['value: string'], ReturnType.String, 'Return the binary version for an input value.')],
+  [
+    'dataUri',
+    new FunctionEntity(
+      ['value: string'],
+      ReturnType.String,
+      'Return a data uniform resource identifier (URI) for a string.'
+    ),
+  ],
+  [
+    'dataUriToBinary',
+    new FunctionEntity(
+      ['value: string'],
+      ReturnType.String,
+      'Return the binary version for a data uniform resource identifier (URI). Use this function rather than decodeDataUri(). Although both functions work the same way, dataUriBinary() is preferred.'
+    ),
+  ],
+  [
+    'dataUriToString',
+    new FunctionEntity(
+      ['value: string'],
+      ReturnType.String,
+      'Return the string version for a data uniform resource identifier (URI).'
+    ),
+  ],
+  [
+    'decodeUriComponent',
+    new FunctionEntity(
+      ['value: string'],
+      ReturnType.String,
+      'Return a string that replaces escape characters with decoded versions.'
+    ),
+  ],
+  [
+    'base64',
+    new FunctionEntity(['value: string'], ReturnType.String, 'Return the base64-encoded version for a string.'),
+  ],
+  [
+    'base64ToBinary',
+    new FunctionEntity(['value: string'], ReturnType.String, 'Return the binary version for a base64-encoded string.'),
+  ],
+  [
+    'base64ToString',
+    new FunctionEntity(
+      ['value: string'],
+      ReturnType.String,
+      'Return the string version for a base64-encoded string, effectively decoding the base64 string. Use this function rather than decodeBase64. Although both functions work the same way, base64ToString() is preferred.'
+    ),
+  ],
+  [
+    'uriComponent',
+    new FunctionEntity(
+      ['value: string'],
+      ReturnType.String,
+      'Return the binary version for a uniform resource identifier (URI) component.'
+    ),
+  ],
+  [
+    'uriComponentToString',
+    new FunctionEntity(
+      ['value: string'],
+      ReturnType.String,
+      'Return the string version for a uniform resource identifier (URI) encoded string, effectively decoding the URI-encoded string.'
+    ),
+  ],
+  ['xml', new FunctionEntity(['xmlStr: string]'], ReturnType.Object, 'Return the XML version for a string.')],
+  [
+    'range',
+    new FunctionEntity(
+      ['startIndex: number', 'count: number'],
+      ReturnType.Object,
+      'Return an integer array that starts from a specified integer.'
+    ),
+  ],
+  [
+    'getFutureTime',
+    new FunctionEntity(
+      ['interval: number', 'timeUnit: string', 'format?: string'],
+      ReturnType.String,
+      'Return the current timestamp plus the specified time units.'
+    ),
+  ],
+  [
+    'getPastTime',
+    new FunctionEntity(
+      ['interval: number', 'timeUnit: string', 'format?: string'],
+      ReturnType.String,
+      'Return the current timestamp minus the specified time units.'
+    ),
+  ],
+  [
+    'addToTime',
+    new FunctionEntity(
+      ['timestamp: string', 'interval: number', 'timeUnit: string', 'format?: string'],
+      ReturnType.String,
+      'Add a number of time units to a timestamp. See also getFutureTime()'
+    ),
+  ],
+  [
+    'convertFromUtc',
+    new FunctionEntity(
+      ['timestamp: string', 'destinationTimeZone: string', 'format?: string'],
+      ReturnType.String,
+      'Convert a timestamp from Universal Time Coordinated(UTC) to target time zone.'
+    ),
+  ],
+  [
+    'convertToUtc',
+    new FunctionEntity(
+      ['timestamp: string', 'sourceTimeZone: string', 'format?: string'],
+      ReturnType.String,
+      'Convert a timestamp to Universal Time Coordinated(UTC) from source time zone.'
+    ),
+  ],
+  [
+    'startOfDay',
+    new FunctionEntity(
+      ['timestamp: string', 'format?: string'],
+      ReturnType.String,
+      'Return the start of the day for a timestamp.'
+    ),
+  ],
+  [
+    'startOfHour',
+    new FunctionEntity(
+      ['timestamp: string', 'format?: string'],
+      ReturnType.String,
+      'Return the start of the hour for a timestamp.'
+    ),
+  ],
+  [
+    'startOfMonth',
+    new FunctionEntity(
+      ['timestamp: string', 'format?: string'],
+      ReturnType.String,
+      'Return the start of the month for a timestamp.'
+    ),
+  ],
+  [
+    'ticks',
+    new FunctionEntity(
+      ['timestamp: string'],
+      ReturnType.Number,
+      'Return the ticks property value for a specified timestamp. A tick is 100-nanosecond interval.'
+    ),
+  ],
+  [
+    'uriQuery',
+    new FunctionEntity(
+      ['uri: string'],
+      ReturnType.String,
+      'Return the query value for a unified resource identifier(URI).'
+    ),
+  ],
+  [
+    'uriHost',
+    new FunctionEntity(
+      ['uri: string'],
+      ReturnType.String,
+      'Return the host value for a unified resource identifier(URI).'
+    ),
+  ],
+  [
+    'uriPath',
+    new FunctionEntity(
+      ['uri: string'],
+      ReturnType.String,
+      'Return the path value for a unified resource identifier(URI).'
+    ),
+  ],
+  [
+    'uriPathAndQuery',
+    new FunctionEntity(
+      ['uri: string'],
+      ReturnType.String,
+      'Return the path and query value for a unified resource identifier(URI).'
+    ),
+  ],
+  [
+    'uriScheme',
+    new FunctionEntity(
+      ['uri: string'],
+      ReturnType.String,
+      'Return the scheme value for a unified resource identifier(URI).'
+    ),
+  ],
+  [
+    'uriPort',
+    new FunctionEntity(
+      ['uri: string'],
+      ReturnType.String,
+      'Return the port value for a unified resource identifier(URI).'
+    ),
+  ],
+  [
+    'coalesce',
+    new FunctionEntity(
+      ['...object: any[]'],
+      ReturnType.Number,
+      'Return the first non-null value from one or more parameters. Empty strings, empty arrays, and empty objects are not null.'
+    ),
+  ],
+  [
+    'xpath',
+    new FunctionEntity(
+      ['xml: any', 'xpath: any'],
+      ReturnType.Object,
+      'Check XML for nodes or values that match an XPath (XML Path Language) expression, and return the matching nodes or values. An XPath expression, or just "XPath", helps you navigate an XML document structure so that you can select nodes or compute values in the XML content.'
+    ),
+  ],
+
+  // extra function (lg only)
+  [
+    'lgTemplate',
+    new FunctionEntity(
+      ['templateName: string', '...params: string[]'],
+      ReturnType.String,
+      'Evaluate a template and get the result.'
+    ),
+  ],
+]);
diff --git a/Composer/packages/tools/language-servers/language-generation/src/index.ts b/Composer/packages/tools/language-servers/language-generation/src/index.ts
new file mode 100644
index 0000000000..0901e84179
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/src/index.ts
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+export * from './LGServer';
diff --git a/Composer/packages/tools/language-servers/language-generation/src/utils.ts b/Composer/packages/tools/language-servers/language-generation/src/utils.ts
new file mode 100644
index 0000000000..7ed7a06c88
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/src/utils.ts
@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import { TextDocument, Range, Position, DiagnosticSeverity, Diagnostic } from 'vscode-languageserver-types';
+import {
+  LGResource,
+  LGParser,
+  DiagnosticSeverity as LGDiagnosticSeverity,
+  ImportResolver,
+  Diagnostic as LGDiagnostic,
+  StaticChecker,
+} from 'botbuilder-lg';
+import get from 'lodash/get';
+
+const staticChecker = new StaticChecker();
+
+export interface Template {
+  Name: string;
+  Parameters?: string[];
+  Body: string;
+}
+
+export interface LGDocument {
+  uri: string;
+  inline: boolean;
+  content?: string;
+  template?: Template;
+}
+
+export function getRangeAtPosition(document: TextDocument, position: Position): Range | undefined {
+  const text = document.getText();
+  const line = position.line;
+  const pos = position.character;
+  const lineText = text.split('\n')[line];
+  let match: RegExpMatchArray | null;
+  const wordDefinition = /[a-zA-Z0-9_/.-]+/g;
+  while ((match = wordDefinition.exec(lineText))) {
+    const matchIndex = match.index || 0;
+    if (matchIndex > pos) {
+      return undefined;
+    } else if (wordDefinition.lastIndex >= pos) {
+      return Range.create(line, matchIndex, line, wordDefinition.lastIndex);
+    }
+  }
+
+  return undefined;
+}
+
+const severityMap = {
+  [LGDiagnosticSeverity.Error]: DiagnosticSeverity.Error,
+  [LGDiagnosticSeverity.Hint]: DiagnosticSeverity.Hint,
+  [LGDiagnosticSeverity.Information]: DiagnosticSeverity.Information,
+  [LGDiagnosticSeverity.Warning]: DiagnosticSeverity.Warning,
+};
+
+export function convertSeverity(severity: LGDiagnosticSeverity): DiagnosticSeverity {
+  return severityMap[severity];
+}
+
+export function convertDiagnostics(lgDiags: LGDiagnostic[] = [], document: TextDocument, lineOffset = 0): Diagnostic[] {
+  const diagnostics: Diagnostic[] = [];
+  lgDiags.forEach(diag => {
+    const diagnostic: Diagnostic = {
+      severity: convertSeverity(diag.Severity),
+      range: Range.create(
+        Position.create(diag.Range.Start.Line - 1 - lineOffset, diag.Range.Start.Character),
+        Position.create(diag.Range.End.Line - 1 - lineOffset, diag.Range.End.Character)
+      ),
+      message: diag.Message,
+      source: document.uri,
+    };
+    diagnostics.push(diagnostic);
+  });
+  return diagnostics;
+}
+
+export function textFromTemplate(template: Template): string {
+  let text = '';
+  if (template.Name && (template.Body !== null && template.Body !== undefined)) {
+    text += `# ${template.Name.trim()}`;
+    if (template.Parameters && template.Parameters.length > 0) {
+      text += '(' + template.Parameters.join(', ') + ')';
+    }
+    text += '\n';
+    text += `${template.Body.trim()}`;
+  }
+  return text;
+}
+
+export function textFromTemplates(templates: Template[]): string {
+  return templates
+    .map(template => {
+      return textFromTemplate(template);
+    })
+    .join('\n');
+}
+
+export function checkTemplate(template: Template): LGDiagnostic[] {
+  const text = textFromTemplate(template);
+  return staticChecker.checkText(text, '', ImportResolver.fileResolver).filter(diagnostic => {
+    // ignore non-exist references in template body.
+    return diagnostic.Message.includes('does not have an evaluator') === false;
+  });
+}
+
+export function checkText(text: string): LGDiagnostic[] {
+  return staticChecker.checkText(text, '', ImportResolver.fileResolver);
+}
+export function isValid(diagnostics: LGDiagnostic[]): boolean {
+  return diagnostics.every(d => d.Severity !== LGDiagnosticSeverity.Error);
+}
+
+export function getLGResources(content: string): LGResource {
+  return LGParser.parse(content, ' ');
+}
+
+export function getTemplatePositionOffset(content: string, { Name, Parameters = [], Body }: Template): number {
+  const resource = LGParser.parse(content).updateTemplate(Name, Name, Parameters, Body);
+  const template = resource.Templates.find(item => item.Name === Name);
+  return get(template, 'ParseTree._start.line', 0);
+}
+
+export function updateTemplateInContent(content: string, { Name, Parameters = [], Body }: Template): string {
+  const resource = LGParser.parse(content);
+  return resource.updateTemplate(Name, Name, Parameters, Body).toString();
+}
diff --git a/Composer/packages/tools/language-servers/language-generation/tsconfig.build.json b/Composer/packages/tools/language-servers/language-generation/tsconfig.build.json
new file mode 100644
index 0000000000..6efd4d2b85
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/tsconfig.build.json
@@ -0,0 +1,7 @@
+{
+  /* Options used for building production code (tests excluded) */
+  "extends": "./tsconfig.json",
+  "include": [
+    "./src/**/*"
+  ]
+}
diff --git a/Composer/packages/tools/language-servers/language-generation/tsconfig.json b/Composer/packages/tools/language-servers/language-generation/tsconfig.json
new file mode 100644
index 0000000000..246669dd93
--- /dev/null
+++ b/Composer/packages/tools/language-servers/language-generation/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "lib"
+  },
+  "include": [
+    "./src/**/*",
+    "./__tests__/**/*"
+  ]
+}
diff --git a/Composer/packages/tools/language-servers/package.json b/Composer/packages/tools/language-servers/package.json
new file mode 100644
index 0000000000..7c0977e0c6
--- /dev/null
+++ b/Composer/packages/tools/language-servers/package.json
@@ -0,0 +1,12 @@
+{
+    "name": "@bfc/language-servers",
+    "version": "1.0.0",
+    "description": "",
+    "main": "index.js",
+    "scripts": {
+        "build": "yarn build:lg",
+        "build:lg": "cd language-generation && yarn build"
+    },
+    "author": "",
+    "license": "ISC"
+}
diff --git a/Composer/packages/tools/package.json b/Composer/packages/tools/package.json
new file mode 100644
index 0000000000..231b4619fc
--- /dev/null
+++ b/Composer/packages/tools/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@bfc/tools",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "build:language-servers": "cd language-servers && yarn build",
+    "build:all": "concurrently --kill-others-on-fail \"yarn:build:language-servers\""
+  },
+  "author": "",
+  "license": "ISC"
+}
diff --git a/Composer/scripts/e2e.sh b/Composer/scripts/e2e.sh
index 3846b0fedf..6eda9118be 100755
--- a/Composer/scripts/e2e.sh
+++ b/Composer/scripts/e2e.sh
@@ -1,17 +1,14 @@
 #!/usr/bin/env bash
 
-set -e
+function cleanup {
+  kill $SERVER_PID
+}
 
-yarn start &
+yarn start >> e2e.log 2>&1 &
 SERVER_PID=$!
 
-npx cypress run --browser chrome
+npx cypress run
 EXIT_CODE=$?
-cleanup
-
-function cleanup {
-  kill $SERVER_PID
-}
 
 # kill server process
 trap cleanup EXIT
diff --git a/Composer/yarn.lock b/Composer/yarn.lock
index c1d16c38ed..84024269f1 100644
--- a/Composer/yarn.lock
+++ b/Composer/yarn.lock
@@ -1741,8 +1741,8 @@
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.6.2":
   version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a"
-  integrity sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@babel/runtime/-/@babel/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a"
+  integrity sha1-ERp4ACpcJfyOM2G+3JUpxpa4Wmo=
   dependencies:
     regenerator-runtime "^0.13.2"
 
@@ -2158,23 +2158,23 @@
 
 "@hapi/address@2.x.x":
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222"
-  integrity sha512-O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@hapi/address/-/@hapi/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222"
+  integrity sha1-HHlM1tvyNU0ese8Q4DA/Vz4cciI=
 
 "@hapi/bourne@1.x.x":
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a"
-  integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@hapi/bourne/-/@hapi/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a"
+  integrity sha1-CnCVreoGckPOMoPhtWuKj0U7JCo=
 
 "@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0":
   version "8.5.0"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.0.tgz#2f9ce301c8898e1c3248b0a8564696b24d1a9a5a"
-  integrity sha512-7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@hapi/hoek/-/@hapi/hoek-8.5.0.tgz#2f9ce301c8898e1c3248b0a8564696b24d1a9a5a"
+  integrity sha1-L5zjAciJjhwySLCoVkaWsk0amlo=
 
 "@hapi/joi@^15.0.0":
   version "15.1.1"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
-  integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@hapi/joi/-/@hapi/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
+  integrity sha1-xnW4pxKW8Cgz+NbSQ7NMV7jOGdc=
   dependencies:
     "@hapi/address" "2.x.x"
     "@hapi/bourne" "1.x.x"
@@ -2183,8 +2183,8 @@
 
 "@hapi/topo@3.x.x":
   version "3.1.6"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"
-  integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@hapi/topo/-/@hapi/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"
+  integrity sha1-aNk1+j6uf91asNf5U/MgXYsr/Ck=
   dependencies:
     "@hapi/hoek" "^8.3.0"
 
@@ -2678,6 +2678,15 @@
     "@types/express-serve-static-core" "*"
     "@types/serve-static" "*"
 
+"@types/express@^4.17.1":
+  version "4.17.1"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/express/-/@types/express-4.17.1.tgz#4cf7849ae3b47125a567dfee18bfca4254b88c5c"
+  integrity sha1-TPeEmuO0cSWlZ9/uGL/KQlS4jFw=
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "*"
+    "@types/serve-static" "*"
+
 "@types/form-data@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
@@ -2835,6 +2844,16 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.4.tgz#8808bd5a82bbf6f5d412eff1c228d178e7c24bb3"
   integrity sha512-02tIL+QIi/RW4E5xILdoAMjeJ9kYq5t5S2vciUdFPXv/ikFTb0zK8q9vXkg4+WAJuYXGiVT1H28AkD2C+IkXVw==
 
+"@types/node@^12.0.4":
+  version "12.12.3"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/node/-/@types/node-12.12.3.tgz#ebfe83507ac506bc3486314a8aa395be66af8d23"
+  integrity sha1-6/6DUHrFBrw0hjFKiqOVvmavjSM=
+
+"@types/node@^12.12.8":
+  version "12.12.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.8.tgz#dab418655af39ce2fa99286a0bed21ef8072ac9d"
+  integrity sha512-XLla8N+iyfjvsa0KKV+BP/iGSoTmwxsu5Ci5sM33z9TjohF72DEz95iNvD6pPmemvbQgxAv/909G73gUn8QR7w==
+
 "@types/prop-types@*":
   version "15.7.1"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6"
@@ -2967,6 +2986,11 @@
     "@types/unist" "*"
     "@types/vfile-message" "*"
 
+"@types/vscode@^1.40.0":
+  version "1.40.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/vscode/-/@types/vscode-1.40.0.tgz#47d19e9e32da512c986f579fe6afbc8d3e6e0c55"
+  integrity sha1-R9GenjLaUSyYb1ef5q+8jT5uDFU=
+
 "@types/webpack-sources@*":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
@@ -3441,10 +3465,17 @@ address@1.0.3, address@^1.0.1:
   resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
   integrity sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==
 
+agent-base@4, agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha1-gWXwHENgCbzK0LHRIvBe13Dvxu4=
+  dependencies:
+    es6-promisify "^5.0.0"
+
 aggregate-error@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
-  integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
+  integrity sha1-2y/nJG5Tb0DZtUQqOeEX191qJOA=
   dependencies:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
@@ -3785,6 +3816,11 @@ async-file@^2.0.2:
   dependencies:
     rimraf "^2.5.2"
 
+async-limiter@^1.0.0:
+  version "1.0.1"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=
+
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
@@ -4620,8 +4656,8 @@ cacache@^12.0.2:
 
 cacache@^13.0.1:
   version "13.0.1"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
-  integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
+  integrity sha1-qAAMIWlwiQgvhSh6GuxuOCAkpxw=
   dependencies:
     chownr "^1.1.2"
     figgy-pudding "^3.5.1"
@@ -4934,8 +4970,8 @@ chownr@^1.1.1:
 
 chownr@^1.1.2:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
-  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
+  integrity sha1-Qtg31SOWiNVfMDADpQgjD6ZycUI=
 
 chrome-trace-event@^1.0.0:
   version "1.0.0"
@@ -4993,8 +5029,8 @@ clean-css@4.2.x, clean-css@^4.2.1:
 
 clean-stack@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha1-7oRy27Ep5yezHooQpCfe6d/kAIs=
 
 clean-webpack-plugin@^2.0.1:
   version "2.0.1"
@@ -7008,7 +7044,7 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
+enhanced-resolve@4.1.0, enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
   integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
@@ -7057,6 +7093,18 @@ es-to-primitive@^1.2.0:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es6-promise@^4.0.3:
+  version "4.2.8"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha1-TrIVlMlyvEBVPSduUQU5FD21Pgo=
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
+  dependencies:
+    es6-promise "^4.0.3"
+
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -7521,8 +7569,8 @@ express@^4.16.4:
 
 express@^4.17.1:
   version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ=
   dependencies:
     accepts "~1.3.7"
     array-flatten "1.1.1"
@@ -7808,9 +7856,9 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
     pkg-dir "^3.0.0"
 
 find-cache-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz#cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"
-  integrity sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==
+  version "3.1.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/find-cache-dir/-/find-cache-dir-3.1.0.tgz#9935894999debef4cf9f677fdf646d002c4cdecb"
+  integrity sha1-mTWJSZnevvTPn2d/32RtACxM3ss=
   dependencies:
     commondir "^1.0.1"
     make-dir "^3.0.0"
@@ -7850,15 +7898,25 @@ find-up@^2.0.0, find-up@^2.1.0:
 
 find-up@^4.0.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk=
   dependencies:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+findup-sync@3.0.0:
+  version "3.0.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  integrity sha1-F7EI+e5RLft6XH88iyfqnhqcCNE=
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
 findup-sync@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  resolved "https://registry.npm.taobao.org/findup-sync/download/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
   integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
   dependencies:
     detect-file "^1.0.0"
@@ -8088,8 +8146,8 @@ fs-minipass@^1.2.5:
 
 fs-minipass@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1"
-  integrity sha512-40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1"
+  integrity sha1-pkFe2rAvrkuekjC8h+4uRHIAPNE=
   dependencies:
     minipass "^3.0.0"
 
@@ -8796,6 +8854,14 @@ http-parser-js@>=0.4.0:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
   integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
 
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha1-5IIb7vWyFCogJr1zkm/lN2McVAU=
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-proxy-middleware@0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -8829,6 +8895,14 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
+https-proxy-agent@^2.2.1:
+  version "2.2.4"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha1-TuenN6vZJniik9mzShr00NCMeHs=
+  dependencies:
+    agent-base "^4.3.0"
+    debug "^3.1.0"
+
 husky@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
@@ -8955,7 +9029,7 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
-import-local@^2.0.0:
+import-local@2.0.0, import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
   integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
@@ -8982,8 +9056,8 @@ indent-string@^3.0.0:
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE=
 
 indexes-of@^1.0.1:
   version "1.0.1"
@@ -9076,7 +9150,7 @@ internal-ip@^4.3.0:
     default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
-interpret@^1.1.0:
+interpret@1.2.0, interpret@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
@@ -10006,8 +10080,8 @@ jest-worker@^24.4.0:
 
 jest-worker@^24.9.0:
   version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
-  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
+  integrity sha1-Xb/bWy0yLphWeJgjipaXvM5ns+U=
   dependencies:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
@@ -10613,8 +10687,8 @@ locate-path@^3.0.0:
 
 locate-path@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha1-Gvujlq/WdqbUJQTQpno6frn2KqA=
   dependencies:
     p-locate "^4.1.0"
 
@@ -10991,8 +11065,8 @@ make-dir@^2.0.0:
 
 make-dir@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz#1b5f39f6b9270ed33f9f054c5c0f84304989f801"
-  integrity sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/make-dir/-/make-dir-3.0.0.tgz#1b5f39f6b9270ed33f9f054c5c0f84304989f801"
+  integrity sha1-G1859rknDtM/nwVMXA+EMEmJ+AE=
   dependencies:
     semver "^6.0.0"
 
@@ -11127,8 +11201,8 @@ merge-stream@^1.0.1:
 
 merge-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A=
 
 merge2@^1.2.3:
   version "1.2.3"
@@ -11293,22 +11367,22 @@ minimist@~0.0.1:
 
 minipass-collect@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha1-IrgTv3Rdxu26JXa5QAIq1u3Ixhc=
   dependencies:
     minipass "^3.0.0"
 
 minipass-flush@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha1-gucTXX6JpQ/+ZGEKeHlTxMTLs3M=
   dependencies:
     minipass "^3.0.0"
 
 minipass-pipeline@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a"
-  integrity sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a"
+  integrity sha1-PctrtKVG4ylpx61xDyx5qGq7qTo=
   dependencies:
     minipass "^3.0.0"
 
@@ -11322,8 +11396,8 @@ minipass@^2.2.1, minipass@^2.3.4:
 
 minipass@^3.0.0, minipass@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
-  integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
+  integrity sha1-dgfOd4RyoYWtbYkIKqIHD3nO3NU=
   dependencies:
     yallist "^4.0.0"
 
@@ -11426,6 +11500,21 @@ moment@2.24.0, "moment@>= 2.9.0":
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
+monaco-editor-core@0.17.0:
+  version "0.17.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/monaco-editor-core/-/monaco-editor-core-0.17.0.tgz#8d2b7f7e02ac68f68eecc881d7a26457cbc09b49"
+  integrity sha1-jSt/fgKsaPaO7MiB16JkV8vAm0k=
+
+monaco-languageclient@^0.10.0:
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/monaco-languageclient/-/monaco-languageclient-0.10.2.tgz#d243964737b29fc20d542deca1835fa045cd19eb"
+  integrity sha512-ZfOm4jQyJzz7rHFIBfLiSM2tfgWoWXkumarLJPSqMFYyK1swIXwS8a8f8cwVZFkJ/aUO1GHcQXaaPZ1B5YtsLQ==
+  dependencies:
+    glob-to-regexp "^0.3.0"
+    vscode-jsonrpc "^4.1.0-next"
+    vscode-languageclient "^5.3.0-next"
+    vscode-uri "^1.0.5"
+
 morgan@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
@@ -11765,6 +11854,11 @@ normalize-url@^4.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.3.0.tgz#9c49e10fc1876aeb76dba88bf1b2b5d9fa57b2ee"
   integrity sha512-0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==
 
+normalize-url@^4.5.0:
+  version "4.5.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
+  integrity sha1-RTNUCH5sqWlXvY9br3U/WYIUISk=
+
 npm-bundled@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
@@ -12085,7 +12179,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-locale@^3.0.0:
+os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -12169,8 +12263,8 @@ p-limit@^2.0.0, p-limit@^2.1.0:
 
 p-limit@^2.2.0:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
-  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
+  integrity sha1-qgeniMwxUck5tRMfY1cPDdIAlTc=
   dependencies:
     p-try "^2.0.0"
 
@@ -12190,8 +12284,8 @@ p-locate@^3.0.0:
 
 p-locate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha1-o0KLtwiLOmApL2aRkni3wpetTwc=
   dependencies:
     p-limit "^2.2.0"
 
@@ -12207,8 +12301,8 @@ p-map@^2.0.0:
 
 p-map@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
+  integrity sha1-1wTZr4orpoTiYA2aIVmD1BQal50=
   dependencies:
     aggregate-error "^3.0.0"
 
@@ -12385,8 +12479,8 @@ path-exists@^3.0.0:
 
 path-exists@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha1-UTvb4tO5XXdi6METfvoZXGxhtbM=
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
@@ -12525,8 +12619,8 @@ pkg-dir@^3.0.0:
 
 pkg-dir@^4.1.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM=
   dependencies:
     find-up "^4.0.0"
 
@@ -13265,8 +13359,8 @@ prettier@^1.15.3:
 
 pretty-bytes@^5.1.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
-  integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
+  integrity sha1-8oSeJ9t5+01s/iR2T8QTTxZZifI=
 
 pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.1"
@@ -13832,6 +13926,11 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
+reconnecting-websocket@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.npm.taobao.org/reconnecting-websocket/download/reconnecting-websocket-3.2.2.tgz#8097514e926e9855e03c39e76efa2e3d1f371bee"
+  integrity sha1-gJdRTpJumFXgPDnnbvouPR83G+4=
+
 recursive-readdir@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
@@ -14028,6 +14127,15 @@ replace-ext@1.0.0:
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
   integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
+request-light@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.npm.taobao.org/request-light/download/request-light-0.2.4.tgz#3cea29c126682e6bcadf7915353322eeba01a755"
+  integrity sha1-POopwSZoLmvK33kVNTMi7roBp1U=
+  dependencies:
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    vscode-nls "^4.0.0"
+
 request-progress@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
@@ -14218,8 +14326,8 @@ rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf
 
 rimraf@^2.7.1:
   version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha1-NXl/E6f9rcVmFCwp1PB8ytSD4+w=
   dependencies:
     glob "^7.1.3"
 
@@ -14440,8 +14548,8 @@ serialize-javascript@^1.7.0:
 
 serialize-javascript@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.0.tgz#9310276819efd0eb128258bb341957f6eb2fc570"
-  integrity sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/serialize-javascript/-/serialize-javascript-2.1.0.tgz#9310276819efd0eb128258bb341957f6eb2fc570"
+  integrity sha1-kxAnaBnv0OsSgli7NBlX9usvxXA=
 
 serve-index@^1.9.1:
   version "1.9.1"
@@ -14756,8 +14864,8 @@ source-map-support@~0.5.10:
 
 source-map-support@~0.5.12:
   version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha1-CuBp5/47p1OMZMmFFeNTOerFoEI=
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -14891,8 +14999,8 @@ ssri@^6.0.1:
 
 ssri@^7.0.0:
   version "7.1.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d"
-  integrity sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d"
+  integrity sha1-ksJBv23oI2W1x/tL126XVSLhKU0=
   dependencies:
     figgy-pudding "^3.5.1"
     minipass "^3.1.1"
@@ -15171,6 +15279,13 @@ supports-color@5.5.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-col
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@6.1.0, supports-color@^6.0.0, supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -15183,13 +15298,6 @@ supports-color@^4.5.0:
   dependencies:
     has-flag "^2.0.0"
 
-supports-color@^6.0.0, supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
 svgo@^1.0.0, svgo@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.0.tgz#305a8fc0f4f9710828c65039bb93d5793225ffc3"
@@ -15292,8 +15400,8 @@ term-size@^1.2.0:
 
 terser-webpack-plugin@2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.1.tgz#5569e6c7d8be79e5e43d6da23acc3b6ba77d22bd"
-  integrity sha512-jwdauV5Al7zopR6OAYvIIRcxXCSvLjZjr7uZE8l2tIWb/ryrGN48sJftqGf5k9z09tWhajx53ldp0XPI080YnA==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/terser-webpack-plugin/-/terser-webpack-plugin-2.2.1.tgz#5569e6c7d8be79e5e43d6da23acc3b6ba77d22bd"
+  integrity sha1-VWnmx9i+eeXkPW2iOsw7a6d9Ir0=
   dependencies:
     cacache "^13.0.1"
     find-cache-dir "^3.0.0"
@@ -15342,7 +15450,7 @@ terser@^3.16.1:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
-terser@^4.1.2, terser@^4.3.9:
+terser@^4.1.2:
   version "4.3.9"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8"
   integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==
@@ -15351,6 +15459,15 @@ terser@^4.1.2, terser@^4.3.9:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^4.3.9:
+  version "4.4.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/terser/-/terser-4.4.0.tgz#22c46b4817cf4c9565434bfe6ad47336af259ac3"
+  integrity sha1-IsRrSBfPTJVlQ0v+atRzNq8lmsM=
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
 test-exclude@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.1.0.tgz#6ba6b25179d2d38724824661323b73e03c0c1de1"
@@ -15714,6 +15831,11 @@ typescript@3.6.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"
   integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==
 
+typescript@^3.6.3:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da"
+  integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==
+
 ua-parser-js@^0.7.18:
   version "0.7.19"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
@@ -15911,8 +16033,8 @@ urix@^0.1.0:
 
 url-loader@2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.2.0.tgz#af321aece1fd0d683adc8aaeb27829f29c75b46e"
-  integrity sha512-G8nk3np8ZAnwhHXas1JxJEwJyQdqFXAKJehfgZ/XrC48volFBRtO+FIKtF2u0Ma3bw+4vnDVjHPAQYlF9p2vsw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/url-loader/-/url-loader-2.2.0.tgz#af321aece1fd0d683adc8aaeb27829f29c75b46e"
+  integrity sha1-rzIa7OH9DWg63Iqusngp8px1tG4=
   dependencies:
     loader-utils "^1.2.3"
     mime "^2.4.4"
@@ -16022,6 +16144,11 @@ uuid@^3.3.3:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
   integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
 
+v8-compile-cache@2.0.3:
+  version "2.0.3"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
+  integrity sha1-APdJTSritojP4omd9u0sVL75Hb4=
+
 v8-compile-cache@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
@@ -16093,6 +16220,62 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+vscode-jsonrpc@^4.1.0-next, vscode-jsonrpc@^4.1.0-next.3:
+  version "4.1.0-next.3"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.3.tgz#05fe742959a2726020d4d0bfbc3d3c97873c7fde"
+  integrity sha1-Bf50KVmicmAg1NC/vD08l4c8f94=
+
+vscode-languageclient@^5.3.0-next:
+  version "5.3.0-next.9"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/vscode-languageclient/-/vscode-languageclient-5.3.0-next.9.tgz#34f58017647f15cd86015f7af45935dc750611f7"
+  integrity sha1-NPWAF2R/Fc2GAV969Fk13HUGEfc=
+  dependencies:
+    semver "^6.3.0"
+    vscode-languageserver-protocol "^3.15.0-next.8"
+
+vscode-languageserver-protocol@^3.15.0-next.8:
+  version "3.15.0-next.8"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.8.tgz#5e3cc0ae143fe3364820249e32f6019ce974fa9e"
+  integrity sha1-XjzArhQ/4zZIICSeMvYBnOl0+p4=
+  dependencies:
+    vscode-jsonrpc "^4.1.0-next.3"
+    vscode-languageserver-types "^3.15.0-next.4"
+
+vscode-languageserver-types@^3.15.0-next.4:
+  version "3.15.0-next.5"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.5.tgz#863d711bf47b338ff5e63ae19fb20d4fcd4d713b"
+  integrity sha1-hj1xG/R7M4/15jrhn7INT81NcTs=
+
+vscode-languageserver@^5.3.0-next:
+  version "5.3.0-next.10"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/vscode-languageserver/-/vscode-languageserver-5.3.0-next.10.tgz#995fe8b57fc4eb9fea0d11762d3a803de4278995"
+  integrity sha1-mV/otX/E65/qDRF2LTqAPeQniZU=
+  dependencies:
+    vscode-languageserver-protocol "^3.15.0-next.8"
+    vscode-textbuffer "^1.0.0"
+
+vscode-nls@^4.0.0:
+  version "4.1.1"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
+  integrity sha1-+ZFrZOSUeyAyLe+x5naklYYfEzw=
+
+vscode-textbuffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/vscode-textbuffer/-/vscode-textbuffer-1.0.0.tgz#1faee638c8e0e4131c8d5c353993a1874acda086"
+  integrity sha1-H67mOMjg5BMcjVw1OZOhh0rNoIY=
+
+vscode-uri@^1.0.5:
+  version "1.0.8"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
+  integrity sha1-l2mq7OyuQCb7biI1nLOJRlgN7Vk=
+
+vscode-ws-jsonrpc@^0.1.1:
+  version "0.1.1"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.1.1.tgz#163ff05662635b4fd161ed132e112cec4d83f126"
+  integrity sha1-Fj/wVmJjW0/RYe0TLhEs7E2D8SY=
+  dependencies:
+    vscode-jsonrpc "^4.1.0-next"
+
 w3c-hr-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
@@ -16168,21 +16351,21 @@ webpack-cli@^3.3.0:
     yargs "^12.0.5"
 
 webpack-cli@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.2.tgz#aed2437b0db0a7faa2ad28484e166a5360014a91"
-  integrity sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==
+  version "3.3.10"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13"
+  integrity sha1-F7J5Jn6bT7VJAj+uFw2o5udm2hM=
   dependencies:
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    enhanced-resolve "^4.1.0"
-    findup-sync "^2.0.0"
-    global-modules "^1.0.0"
-    import-local "^2.0.0"
-    interpret "^1.1.0"
-    loader-utils "^1.1.0"
-    supports-color "^5.5.0"
-    v8-compile-cache "^2.0.2"
-    yargs "^12.0.5"
+    chalk "2.4.2"
+    cross-spawn "6.0.5"
+    enhanced-resolve "4.1.0"
+    findup-sync "3.0.0"
+    global-modules "2.0.0"
+    import-local "2.0.0"
+    interpret "1.2.0"
+    loader-utils "1.2.3"
+    supports-color "6.1.0"
+    v8-compile-cache "2.0.3"
+    yargs "13.2.4"
 
 webpack-dev-middleware@^3.7.2:
   version "3.7.2"
@@ -16195,10 +16378,10 @@ webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.9.0:
+webpack-dev-server@3.9.0, webpack-dev-server@^3.9.0:
   version "3.9.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz#27c3b5d0f6b6677c4304465ac817623c8b27b89c"
-  integrity sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz#27c3b5d0f6b6677c4304465ac817623c8b27b89c"
+  integrity sha1-J8O10Pa2Z3xDBEZayBdiPIsnuJw=
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -16283,8 +16466,8 @@ webpack-log@^2.0.0:
 
 webpack-manifest-plugin@2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.1.0.tgz#5c7c6b3bcfc28fa4a32bcd63c739a83a04eb41bf"
-  integrity sha512-vQn/mY9okBQUim6fQo+8lYzn/MWcSMGbGpQyKIR6c6NF++lVxfzdlZBL0FGVQsb1RFL/rPdKwu6hkbtWv6CEYg==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/webpack-manifest-plugin/-/webpack-manifest-plugin-2.1.0.tgz#5c7c6b3bcfc28fa4a32bcd63c739a83a04eb41bf"
+  integrity sha1-XHxrO8/Cj6SjK81jxzmoOgTrQb8=
   dependencies:
     fs-extra "^7.0.0"
     lodash ">=3.5 <5"
@@ -16308,8 +16491,8 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
 
 webpack@4.41.2:
   version "4.41.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
-  integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
+  integrity sha1-w07Hbao6hGjJthpQM22OMwPc504=
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
@@ -16466,22 +16649,22 @@ wordwrap@~1.0.0:
 
 workbox-background-sync@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz#26821b9bf16e9e37fd1d640289edddc08afd1950"
-  integrity sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz#26821b9bf16e9e37fd1d640289edddc08afd1950"
+  integrity sha1-JoIbm/Funjf9HWQCie3dwIr9GVA=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-broadcast-update@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz#e2c0280b149e3a504983b757606ad041f332c35b"
-  integrity sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz#e2c0280b149e3a504983b757606ad041f332c35b"
+  integrity sha1-4sAoCxSeOlBJg7dXYGrQQfMyw1s=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-build@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-4.3.1.tgz#414f70fb4d6de47f6538608b80ec52412d233e64"
-  integrity sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-build/-/workbox-build-4.3.1.tgz#414f70fb4d6de47f6538608b80ec52412d233e64"
+  integrity sha1-QU9w+01t5H9lOGCLgOxSQS0jPmQ=
   dependencies:
     "@babel/runtime" "^7.3.4"
     "@hapi/joi" "^15.0.0"
@@ -16509,27 +16692,27 @@ workbox-build@^4.3.1:
 
 workbox-cacheable-response@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz#f53e079179c095a3f19e5313b284975c91428c91"
-  integrity sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz#f53e079179c095a3f19e5313b284975c91428c91"
+  integrity sha1-9T4HkXnAlaPxnlMTsoSXXJFCjJE=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-core@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-4.3.1.tgz#005d2c6a06a171437afd6ca2904a5727ecd73be6"
-  integrity sha512-I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-core/-/workbox-core-4.3.1.tgz#005d2c6a06a171437afd6ca2904a5727ecd73be6"
+  integrity sha1-AF0sagahcUN6/WyikEpXJ+zXO+Y=
 
 workbox-expiration@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-4.3.1.tgz#d790433562029e56837f341d7f553c4a78ebe921"
-  integrity sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-expiration/-/workbox-expiration-4.3.1.tgz#d790433562029e56837f341d7f553c4a78ebe921"
+  integrity sha1-15BDNWICnlaDfzQdf1U8Snjr6SE=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-google-analytics@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz#9eda0183b103890b5c256e6f4ea15a1f1548519a"
-  integrity sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz#9eda0183b103890b5c256e6f4ea15a1f1548519a"
+  integrity sha1-ntoBg7EDiQtcJW5vTqFaHxVIUZo=
   dependencies:
     workbox-background-sync "^4.3.1"
     workbox-core "^4.3.1"
@@ -16538,55 +16721,55 @@ workbox-google-analytics@^4.3.1:
 
 workbox-navigation-preload@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz#29c8e4db5843803b34cd96dc155f9ebd9afa453d"
-  integrity sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz#29c8e4db5843803b34cd96dc155f9ebd9afa453d"
+  integrity sha1-Kcjk21hDgDs0zZbcFV+evZr6RT0=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-precaching@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-4.3.1.tgz#9fc45ed122d94bbe1f0ea9584ff5940960771cba"
-  integrity sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-precaching/-/workbox-precaching-4.3.1.tgz#9fc45ed122d94bbe1f0ea9584ff5940960771cba"
+  integrity sha1-n8Re0SLZS74fDqlYT/WUCWB3HLo=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-range-requests@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz#f8a470188922145cbf0c09a9a2d5e35645244e74"
-  integrity sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz#f8a470188922145cbf0c09a9a2d5e35645244e74"
+  integrity sha1-+KRwGIkiFFy/DAmpotXjVkUkTnQ=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-routing@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-4.3.1.tgz#a675841af623e0bb0c67ce4ed8e724ac0bed0cda"
-  integrity sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-routing/-/workbox-routing-4.3.1.tgz#a675841af623e0bb0c67ce4ed8e724ac0bed0cda"
+  integrity sha1-pnWEGvYj4LsMZ85O2OckrAvtDNo=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-strategies@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-4.3.1.tgz#d2be03c4ef214c115e1ab29c9c759c9fe3e9e646"
-  integrity sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-strategies/-/workbox-strategies-4.3.1.tgz#d2be03c4ef214c115e1ab29c9c759c9fe3e9e646"
+  integrity sha1-0r4DxO8hTBFeGrKcnHWcn+Pp5kY=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-streams@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-4.3.1.tgz#0b57da70e982572de09c8742dd0cb40a6b7c2cc3"
-  integrity sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-streams/-/workbox-streams-4.3.1.tgz#0b57da70e982572de09c8742dd0cb40a6b7c2cc3"
+  integrity sha1-C1facOmCVy3gnIdC3Qy0Cmt8LMM=
   dependencies:
     workbox-core "^4.3.1"
 
 workbox-sw@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-4.3.1.tgz#df69e395c479ef4d14499372bcd84c0f5e246164"
-  integrity sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-sw/-/workbox-sw-4.3.1.tgz#df69e395c479ef4d14499372bcd84c0f5e246164"
+  integrity sha1-32njlcR5700USZNyvNhMD14kYWQ=
 
 workbox-webpack-plugin@4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-4.3.1.tgz#47ff5ea1cc074b6c40fb5a86108863a24120d4bd"
-  integrity sha512-gJ9jd8Mb8wHLbRz9ZvGN57IAmknOipD3W4XNE/Lk/4lqs5Htw4WOQgakQy/o/4CoXQlMCYldaqUg+EJ35l9MEQ==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-webpack-plugin/-/workbox-webpack-plugin-4.3.1.tgz#47ff5ea1cc074b6c40fb5a86108863a24120d4bd"
+  integrity sha1-R/9eocwHS2xA+1qGEIhjokEg1L0=
   dependencies:
     "@babel/runtime" "^7.0.0"
     json-stable-stringify "^1.0.1"
@@ -16594,8 +16777,8 @@ workbox-webpack-plugin@4.3.1:
 
 workbox-window@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-4.3.1.tgz#ee6051bf10f06afa5483c9b8dfa0531994ede0f3"
-  integrity sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/workbox-window/-/workbox-window-4.3.1.tgz#ee6051bf10f06afa5483c9b8dfa0531994ede0f3"
+  integrity sha1-7mBRvxDwavpUg8m436BTGZTt4PM=
   dependencies:
     workbox-core "^4.3.1"
 
@@ -16668,7 +16851,7 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^5.2.0:
+ws@^5.0.0, ws@^5.2.0:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
   integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
@@ -16682,6 +16865,13 @@ ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
+ws@^7.2.0:
+  version "7.2.0"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/ws/-/ws-7.2.0.tgz#422eda8c02a4b5dba7744ba66eebbd84bcef0ec7"
+  integrity sha1-Qi7ajAKktdundEumbuu9hLzvDsc=
+  dependencies:
+    async-limiter "^1.0.0"
+
 wsrun@^3.6.4:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/wsrun/-/wsrun-3.6.4.tgz#05cfcc5bfaf3056c3eecb0762fdc1038cb3db0bc"
@@ -16778,8 +16968,8 @@ yallist@^3.0.0, yallist@^3.0.2:
 
 yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=
 
 yargs-parser@10.x:
   version "10.1.0"
@@ -16796,6 +16986,14 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^13.1.0:
+  version "13.1.1"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
+  integrity sha1-0mBYUyqgbTZf4JH2ofwGsvfl7KA=
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
@@ -16836,6 +17034,23 @@ yargs@12.0.5, yargs@^12.0.1, yargs@^12.0.2, yargs@^12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
+yargs@13.2.4:
+  version "13.2.4"
+  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+  integrity sha1-C1YreUAW65ZRuYvTes82SqXW3IM=
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.0"
+
 yargs@^10.0.3:
   version "10.1.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f0b2fa4364..96892f72f6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,7 +5,7 @@ pr:
   autoCancel: true
   branches:
     include:
-      - '*'
+      - "*"
 
 variables:
   YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn
@@ -52,10 +52,17 @@ jobs:
           CYPRESS_SCREENSHOTS_FOLDER: $(Build.ArtifactStagingDirectory)/cypress/screenshots
           CYPRESS_VIDEOS_FOLDER: $(Build.ArtifactStagingDirectory)/cypress/videos
           TERM: xterm
-          COMPOSER_BOTS_FOLDER: $(Pipeline.Workspace)/Composer/TestBots
+          COMPOSER_BOTS_FOLDER: $(System.DefaultWorkingDirectory)/MyBots
+          DEBUG: composer
       - task: PublishPipelineArtifact@1
+        displayName: Publish Cypress Artifacts
         condition: failed()
         continueOnError: true
         inputs:
           targetPath: $(Build.ArtifactStagingDirectory)/cypress
           artifactName: e2e
+      - script: cat e2e.log
+        displayName: Server Logs
+        condition: always()
+        continueOnError: true
+        workingDirectory: Composer
diff --git a/docs/concept-dialog.md b/docs/concept-dialog.md
index 7ea074c3d8..2bfdd048b6 100644
--- a/docs/concept-dialog.md
+++ b/docs/concept-dialog.md
@@ -1,102 +1,113 @@
-# Dialogs 
+# Dialogs
+
 Modern conversational software is comprised of many components, including programming code, custom business logic, cloud APIs, training data for language processing systems and perhaps most importantly, the actual content used in conversations with the bot's end users. With Composer, all of these pieces are integrated with one another into a single interface for constructing blocks of bot functionality called **Dialogs**. ([SDK Docs: Bot Framework Dialogs](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-dialog?view=azure-bot-service-4.0))
 
-Each dialog represents a piece of the bot's functionality. They contain instructions for how the bot will react to input. Simple bots will have a few dialogs. Complex bots may have dozens or hundreds of individual dialogs. 
+Each dialog represents a piece of the bot's functionality. They contain instructions for how the bot will react to input. Simple bots will have a few dialogs. Complex bots may have dozens or hundreds of individual dialogs.
 
 In Composer, dialogs are functional components offered in a visual interface and do not require you to write code. The dialog system supports building a pluggable and extensible model that integrates building blocks of bot functionality. Dialogs help users focus on conversation modeling rather than the mechanics of dialog management.
 
-## Types of dialogs  
-There are two types of dialogs in Composer: main dialog and child dialog. Below is a screenshot of a main dialog named `MyBot.Main` and two child dialogs named `Weather` and `Greeting`. 
+## Types of dialogs
+
+There are two types of dialogs in Composer: main dialog and child dialog. Below is a screenshot of a main dialog named `MyBot.Main` and two child dialogs named `Weather` and `Greeting`.
 
 ![main_child_dialog](./media/dialog/main_child_dialog.png)
 
-You create a dialog in Composer to manage a conversation objective. Main dialog is initialized by default when you create a new bot and it has a **.Main** file extension. Each bot has one main dialog and can have multiple child dialogs or no child dialogs. Read the [Add a dialog](./tutorial/bot-tutorial-add-dialog.md) section to create a dialog in Composer. 
+You create a dialog in Composer to manage a conversation objective. Main dialog is initialized by default when you create a new bot and it has a **.Main** file extension. Each bot has one main dialog and can have multiple child dialogs or no child dialogs. Read the [Add a dialog](./tutorial/bot-tutorial-add-dialog.md) section to create a dialog in Composer.
 
-At runtime, the main dialog is called into action and becomes the active dialog, triggering event handlers with pre-defined actions. As the conversation flows, a child dialog can be called by a main dialog, and vice versa. Different child dialogs can be called with each other as well. 
+At runtime, the main dialog is called into action and becomes the active dialog, triggering event handlers with pre-defined actions. As the conversation flows, a child dialog can be called by a main dialog, and vice versa. Different child dialogs can be called with each other as well.
 
-## Anatomy of a dialog 
-The following diagram shows the anatomy of a dialog in Composer. Note that dialogs in Composer are based on [Adaptive dialogs](https://github.com/Microsoft/BotBuilder-Samples/tree/master/experimental/adaptive-dialog#readme). 
+## Anatomy of a dialog
+
+The following diagram shows the anatomy of a dialog in Composer. Note that dialogs in Composer are based on [Adaptive dialogs](https://github.com/Microsoft/BotBuilder-Samples/tree/master/experimental/adaptive-dialog#readme).
 
 ![adaptive-dialog-anatomy](./media/dialog/adaptive-dialog-anatomy.png)
 
 ### Recognizer
-When a dialog is called into action its **recognizer** will start to process the message and try to extract the primary **intent** and any **entity values** the message includes. After processing the message, both the **intent** and **entity values** are passed onto the dialog's triggers. Composer currently supports two recognizers: the LUIS recognizer (default) and the Regular Expression recognizer. You can choose only one recognizer per dialog, and a dialog can have no recognizer choosing the `None` type. Below is a screenshot of recognizers supported in Composer. 
+
+When a dialog is called into action its **recognizer** will start to process the message and try to extract the primary **intent** and any **entity values** the message includes. After processing the message, both the **intent** and **entity values** are passed onto the dialog's triggers. Composer currently supports two recognizers: the LUIS recognizer (default) and the Regular Expression recognizer. You can choose only one recognizer per dialog, and a dialog can have no recognizer choosing the `None` type. Below is a screenshot of recognizers supported in Composer.
 
 ![recognizer](./media/dialog/recognizer.png)
 
 **Recognizers** provide the functionality of understanding and extracting meaningful pieces of information from a user's input. All recognizers emit events when the recognizer picks up an **intent** (or extracts **entities**) from a given user utterance. A **recognizer** of a dialog is not always called into play when a dialog is called. It depends on how you design the dialog system.
 
 ### Trigger
-The functionality of a dialog is contained within triggers - rules that tell the bot how to process incoming messages. They are also used to define a wide variety of bot behaviors, from performing the main fulfillment of the user's request, to handling [interruptions](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-howto-handle-user-interrupt?view=azure-bot-service-4.0&tabs=csharp) like requests for help, to handling custom, developer-defined events originating from the app itself. Below is a screenshot of the trigger menu in Composer. 
+
+The functionality of a dialog is contained within triggers - rules that tell the bot how to process incoming messages. They are also used to define a wide variety of bot behaviors, from performing the main fulfillment of the user's request, to handling [interruptions](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-howto-handle-user-interrupt?view=azure-bot-service-4.0&tabs=csharp) like requests for help, to handling custom, developer-defined events originating from the app itself. Below is a screenshot of the trigger menu in Composer.
 
 ![trigger_menu](./media/dialog/trigger_menu.gif)
 
-### Action 
-Triggers contain a series of actions that the bot will undertake to fulfill a user's request. Actions are things like sending messages, making calculations, and performing computational tasks on behalf of the user. The path the bot follows through a dialog can branch and loop. The bot can ask questions, validate input, manipulate and store values in memory, and make decisions. Below is a screenshot of the action menu in Composer. Click the **+** sign below the trigger you can mouse over the action menu. 
+### Action
+
+Triggers contain a series of actions that the bot will undertake to fulfill a user's request. Actions are things like sending messages, making calculations, and performing computational tasks on behalf of the user. The path the bot follows through a dialog can branch and loop. The bot can ask questions, validate input, manipulate and store values in memory, and make decisions. Below is a screenshot of the action menu in Composer. Click the **+** sign below the trigger you can mouse over the action menu.
 
 ![action_menu](./media/dialog/action_menu.gif)
 
 ### Language generator
-As the bot takes actions and sends messages, the **language generator** is called into play. This allows messages sent by the bot to be composed from variables and templates. Language generators can be used to create reusable components, variable messages, macros, and dynamic messages that are grammatically correct. 
+
+As the bot takes actions and sends messages, the **language generator** is called into play. This allows messages sent by the bot to be composed from variables and templates. Language generators can be used to create reusable components, variable messages, macros, and dynamic messages that are grammatically correct.
 
 <!---With a single click from within Composer, developers can launch the bot runtime, and connect to their bot in the Bot Framework Emulator. Once tested in the emulator, the bot runtime can be connected to the Bot Framework Channel service, and from there... the world! -->
-## Create a dialog 
+
+## Create a dialog
+
 When you create a bot in Composer you also create its main dialog by default. Follow the steps to create a bot project and its main dialog:
 
-1. On the left side of the Composer home screen, click **+ New** from the upper left corner (or the big **+ ** sign under "Bot Framework Composer" in the middle part of the home screen). 
+1. On the left side of the Composer home screen, click **+ New** from the upper left corner (or the big **+ ** sign under "Bot Framework Composer" in the middle part of the home screen).
 
-![create_new_bot](./media/dialog/create_new_bot.png) 
+![create_new_bot](./media/dialog/create_new_bot.png)
 
-2. After you see the pop-up window, select **Create from scratch** and click **Submit**. 
+2. After you see the pop-up window, select **Create from scratch** and click **Submit**.
 
-3. In the pop-up window give a name for your bot and optionally fill in a brief description and click **Next**. Leave the **Location** field as is at this time. 
+3. In the pop-up window give a name for your bot and optionally fill in a brief description and click **Next**. Leave the **Location** field as is at this time.
 
 ![new_bot](./media/dialog/new_bot.png)
 
-When your bot is created successfully you will see a **.Main** dialog in the dialog navigation pane. Congratulations! You have created your first bot and its main dialog using Composer. Below is a screenshot of a bot named `Greeting` and its main dialog named `Greeting.Main`: 
+When your bot is created successfully you will see a **.Main** dialog in the dialog navigation pane. Congratulations! You have created your first bot and its main dialog using Composer. Below is a screenshot of a bot named `Greeting` and its main dialog named `Greeting.Main`:
 
 ![main_dialog](./media/dialog/main_dialog.png)
 
 > [!NOTE]
-> After you create a bot a **ConversationUpdate** trigger will be created by default as well. It is a trigger to handle activities such as sending a welcome message. For details please read [events and triggers](concept-events-and-triggers.md). 
+> After you create a bot a **ConversationUpdate** trigger will be created by default as well. It is a trigger to handle activities such as sending a welcome message. For details please read [events and triggers](concept-events-and-triggers.md).
 
-## Add a dialog 
-After you create a bot you are also creating its main dialog by default. The main dialog is like the brain of our bot, controlling and managing the dialog system. Sometimes we find it useful to create a child dialog that contains a chunk of functionality so that our dialog system is organized and easily managed. Let's walk through a very simple example to show how to create a child dialog and wire it up to the main dialog. 
+## Add a dialog
 
-1. Create a child dialog. Click **New Dialog** on the navigation pane. On the pop-up window give a name for the new dialog and optionally fill in the description and then click **Next**. 
+After you create a bot you are also creating its main dialog by default. The main dialog is like the brain of our bot, controlling and managing the dialog system. Sometimes we find it useful to create a child dialog that contains a chunk of functionality so that our dialog system is organized and easily managed. Let's walk through a very simple example to show how to create a child dialog and wire it up to the main dialog.
+
+1. Create a child dialog. Click **New Dialog** on the navigation pane. On the pop-up window give a name for the new dialog and optionally fill in the description and then click **Next**.
 
 ![weather_dialog](./media/dialog/weather_dialog.png)
 
-After that, you will see an empty dialog you created on the navigation pane. When creating a child dialog you also create a **Dialog started (BeginDialog)** trigger by default. The new dialog named `Weather` may look like this: 
+After that, you will see an empty dialog you created on the navigation pane. When creating a child dialog you also create a **Dialog started (Begin dialog event)** trigger by default. The new dialog named `Weather` may look like this:
 
 ![new_weather_dialog](./media/dialog/new_weather_dialog.png)
 
-2. Define an action in the **BeginDialog** trigger. Click the `+` sign under **Dialog started (BeginDialog)** in the new dialog and select **Send a response**. In the Language Generation editor put a sentence: "The weather dialog is calle with success!"
+2. Define an action in the **BeginDialog** trigger. Click the `+` sign under **Dialog started (Begin dialog event)** in the new dialog and select **Send a response**. In the Language Generation editor put a sentence: "The weather dialog is calle with success!"
 
 ![send_response](./media/dialog/send_response.gif)
 
-3. Wire up the new dialog. Click the main dialog in navigation pane and select **ConversationUpdate**. In the authoring canvas, click the **+** sign under **ConversationUpdate** and select **Dialog management** and then **Begin a new dialog** which is a dialog action that begins another dialog. When that dialog is completed, it will return to the caller. 
+3. Wire up the new dialog. Click the main dialog in navigation pane and select **ConversationUpdate**. In the authoring canvas, click the **+** sign under **ConversationUpdate** and select **Dialog management** and then **Begin a new dialog** which is a dialog action that begins another dialog. When that dialog is completed, it will return to the caller.
 
 ![begin_dialog_action](./media/dialog/begin_dialog_action.png)
 
-Now in the properties panel on the right side select the dialog you want to wire up from the drop-down menu. Let's select `Weather` dialog and then you will see the name of the new dialog appear in the **Begin a new dialog** action node. 
+Now in the properties panel on the right side select the dialog you want to wire up from the drop-down menu. Let's select `Weather` dialog and then you will see the name of the new dialog appear in the **Begin a new dialog** action node.
 
 ![wire_up_dialog](./media/dialog/wire_up_dialog.gif)
 
-When the bot runs, the pattern of this simple design is as follows: 
+When the bot runs, the pattern of this simple design is as follows:
 
 - The main dialog `Greeting.Main` is called at bot runtime.
-- The **ConversationUpdate** trigger in the main dialog is activated and begins to execute the **Begin a new dialog** action which begins `Weather` dialog. 
-- When `Weather` dialog becomes active, the **BeginDialog** trigger in the child dialog is fired and send the response "The weather dialog is called with success!" to users. 
-  
-You can test the result by clicking **Start** on the upper right corner and then click **Test in Emulator**. You should be able to see the following result in the emulator: 
+- The **ConversationUpdate** trigger in the main dialog is activated and begins to execute the **Begin a new dialog** action which begins `Weather` dialog.
+- When `Weather` dialog becomes active, the **BeginDialog** trigger in the child dialog is fired and send the response "The weather dialog is called with success!" to users.
+
+You can test the result by clicking **Start** on the upper right corner and then click **Test in Emulator**. You should be able to see the following result in the emulator:
 
 ![test_emulator](./media/dialog/test_emulator.png)
 
-## Dialog actions 
-A bot will have a few dialogs or hundreds of individual dialogs and traditionally it's difficult to manage the dialog system and the conversation with user. In the previous "Add a dialog" section, we cover how to create a child dialog and wire it up to the dialog system using **Begin a new dialog** action. In fact, Composer provides more dialog actions to make it easier to manage the dialog system. You can access the different dialog actions by clicking the **+** node under a trigger and then select **Dialog management**.  
+## Dialog actions
 
-Below is a list of the dialog actions provided in Composer: 
+A bot will have a few dialogs or hundreds of individual dialogs and traditionally it's difficult to manage the dialog system and the conversation with user. In the previous "Add a dialog" section, we cover how to create a child dialog and wire it up to the dialog system using **Begin a new dialog** action. In fact, Composer provides more dialog actions to make it easier to manage the dialog system. You can access the different dialog actions by clicking the **+** node under a trigger and then select **Dialog management**.
+
+Below is a list of the dialog actions provided in Composer:
 
 | Dialog Action       | Description                                                                                                                      |
 | ------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
@@ -107,12 +118,14 @@ Below is a list of the dialog actions provided in Composer:
 | Repeat this Dialog  | An action that repeats the current dialog with the same dialog.                                                                  |
 | Replace this Dialog | An action that replaces the current dialog with the target dialog.                                                               |
 
-With these dialog actions, we can easily build a pluggable and extensible dialog system without worrying about the mechanics of dialog management. 
+With these dialog actions, we can easily build a pluggable and extensible dialog system without worrying about the mechanics of dialog management.
+
+## Further reading
 
-## Further reading 
 [Dialogs library](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-concept-dialog?view=azure-bot-service-4.0)
 
 [Adaptive dialogs](https://github.com/Microsoft/BotBuilder-Samples/tree/master/experimental/adaptive-dialog#readme)
 
-## Next 
+## Next
+
 [Events and triggers](./concept-events-and-triggers.md)
diff --git a/docs/concept-events-and-triggers.md b/docs/concept-events-and-triggers.md
index cb68ebacf0..b0bf02578d 100644
--- a/docs/concept-events-and-triggers.md
+++ b/docs/concept-events-and-triggers.md
@@ -9,7 +9,7 @@ On the navigation pane, click **New Trigger** and you will see the trigger menu
 There are different types of triggers. They all work in a similar manner, and in some cases, can be interchanged. This section will cover the different types of triggers and when should we use them. Read more to learn how to [define triggers](howto-defining-triggers.md). 
 
 ### Dialog trigger  
-The base type of triggers are dialog triggers. Almost all events start as dialog events which are related to the "lifecycle" of the dialog. Currently there are four different dialog triggers in Composer: **Dialog started (BeginDialog)**, **Dialog cancelled (CancelDialog)**, **Error occurred** and **Re-prompt for input**. Most dialogs will include a trigger configured to respond to the `BeginDialog` event, which fires when the dialog begins and allows the bot to respond immediately. 
+The base type of triggers are dialog triggers. Almost all events start as dialog events which are related to the "lifecycle" of the dialog. Currently there are four different dialog triggers in Composer: **Dialog started (Begin dialog event)**, **Dialog cancelled (CancelDialog)**, **Error occurred** and **Re-prompt for input**. Most dialogs will include a trigger configured to respond to the `BeginDialog` event, which fires when the dialog begins and allows the bot to respond immediately. 
 
 Use dialog triggers when you want to:
 - Take actions immediately when the dialog starts, even before the recognizer is called