microsoft
diff --git a/‎js/samples/01.messaging.a.echoBot/.env
+1 b/‎js/samples/01.messaging.a.echoBot/.env
+1
diff --git a/‎js/samples/01.messaging.a.echoBot/README.md
+46-125 b/‎js/samples/01.messaging.a.echoBot/README.md
+46-125
@@ -1,2 +1,3 @@
 MicrosoftAppId=
 MicrosoftAppPassword=
+#This sample does not use AI and therefore an AI service key is not required.
@@ -2,24 +2,11 @@
 
 This sample shows how to incorporate a basic conversational flow into a Microsoft Teams application using [Bot Framework](https://dev.botframework.com) and the Teams AI SDK.
 
-<!-- @import "[TOC]" {cmd="toc" depthFrom=1 depthTo=6 orderedList=false} -->
+## Showcase
 
-<!-- code_chunk_output -->
-
--   [Teams Echo Bot](#teams-echo-bot)
-    -   [Setting up the sample](#setting-up-the-sample)
-    -   [Interacting with the bot](#interacting-with-the-bot)
-    -   [Multiple ways to test](#multiple-ways-to-test)
-        -   [Using Teams Toolkit for Visual Studio Code](#using-teams-toolkit-for-visual-studio-code)
-        -   [Using Teams Toolkit CLI](#using-teams-toolkit-cli)
-        -   [Manually upload the app to a Teams desktop client](#manually-upload-the-app-to-a-teams-desktop-client)
-    -   [Testing in BotFramework Emulator](#testing-in-botframework-emulator)
-    -   [Testing in BotFramework Emulator](#testing-in-botframework-emulator-1)
-        -   [Directions](#directions)
-    -   [Deploy the bot to Azure](#deploy-the-bot-to-azure)
-    -   [Further reading](#further-reading)
-
-<!-- /code_chunk_output -->
+- The bot echos back any message it receives. That's it!
+- This app is the bot-equivalent of 'Hello world'.
+- The minimum setup shows how to set up a bot with the Teams AI SDK.
 
 ## Setting up the sample
 
@@ -29,152 +16,86 @@ This sample shows how to incorporate a basic conversational flow into a Microsof
     git clone https://github.com/Microsoft/teams-ai.git
     ```
 
-2. In the root JavaScript folder, install and build all dependencies
+1. If you do not have `yarn` installed, install it globally
+
+    ```bash
+    npm install -g [email protected]
+    ```
+
+1. In the root **JavaScript folder**, install and build all dependencies
 
     ```bash
     cd teams-ai/js
-    yarn install
+    yarn install #only needs to be run once, after clone or remote pull
     yarn build
     ```
 
-3. In a terminal, navigate to the sample root.
+1. In a terminal, navigate to the sample root.
 
     ```bash
-    cd teams-ai/js/samples/01.messaging.a.echobot/
+    cd samples/<this-sample-folder>/
     yarn start
     ```
 
-## Interacting with the bot
-
-You can interact with this bot by sending it a message, which will echo back to you.
-
-## Multiple ways to test
+The easiest and fastest way to get up and running is with Teams Toolkit as your development guide. To use Teams Toolkit to continue setup and debugging, please continue below. To read about other options, skip to [Other ways to run the sample](#other-ways-to-run-the-sample).
 
-The easiest and fastest way to get up and running is with Teams Toolkit as your development guide. To use Teams Toolkit to continue setup and debugging, please continue below.
+## Teams Toolkit for Visual Studio Code
 
-Otherwise, if you only want to run the bot locally and build manually, please jump to the [BotFramework Emulator](#testing-in-BotFramework-emulator) section.
+Teams Toolkit automates the setup of Azure Bot Resources and provides a local development environment for your bot. It also provides a debugging experience in VS Code that allows you to test your bot in a Teams web client.
 
-### Using Teams Toolkit for Visual Studio Code
-
-The simplest way to run this sample in Teams is to use Teams Toolkit for Visual Studio Code.
+### Prerequisites
 
 1. Ensure you have downloaded and installed [Visual Studio Code](https://code.visualstudio.com/docs/setup/setup-overview)
 1. Install the [Teams Toolkit extension](https://marketplace.visualstudio.com/items?itemName=TeamsDevApp.ms-teams-vscode-extension)
+
+### Run the sample
 1. Select **File > Open Folder** in VS Code and choose this sample's directory from the repo
-1. Using the extension, sign in with your Microsoft 365 account where you have permissions to upload custom apps
-1. Select **Debug > Start Debugging** or **F5** to run the app in a Teams web client.
+    - Running the debugger from the root of the repo will not work - you must open a new window at the sample's root.
+1. Using the TTK extension, sign in with your Microsoft 365 account where you have permissions to upload custom apps to Teams.
+1. Further, detailed instructions can be found at [Getting Started - Teams Toolkit](https://github.com/microsoft/teams-ai/tree/main/getting-started/OTHER/TEAMS-TOOLKIT.md)
+1. Select **Debug > Start Debugging** or **F5** to run the app in a Teams web client (in Microsoft Edge).
 1. In the browser that launches, select the **Add** button to install the app to Teams.
 
 > If you do not have permission to upload custom apps (sideloading), Teams Toolkit will recommend creating and using a Microsoft 365 Developer Program account - a free program to get your own dev environment sandbox that includes Teams.
 
-### Using Teams Toolkit CLI
-
-You can also use the Teams Toolkit CLI to run this sample.
-
-1. Install the CLI
-
-    ```bash
-    npm install -g @microsoft/teamsfx-cli
-    ```
-
-1. Open a second shell instance and run ngrok tunneling service - point to port 3978
-
-    ```bash
-    ngrok http --host-header=rewrite 3978
-    ```
-
-1. Copy the ngrok URL and put the URL and domain in the `/env/env.local` file
-
-    ```bash
-    BOT_ENDPOINT=https://{ngrok-url}.ngrok.io
-    BOT_DOMAIN={ngrok-url}.ngrok.io
-    ```
-
-1. In the repository directory, run the Teams Toolkit CLI commands to automate the setup needed for the app
-
-    ```bash
-    cd teams-ai/js/samples/01.messaging.a.echobot/
-    teamsfx provision --env local
-
-    ```
-
-1. Next, use the CLI to validate and create an app package
-
-    ```bash
-    teamsfx deploy --env local
-    ```
-
-1. Finally, use the CLI to preview the app in Teams
-
-    ```bash
-    teamsfx preview --env local
-    ```
-
-### Manually upload the app to a Teams desktop client
-
-> If you used Teams Toolkit in the above steps, you can [upload a custom app](https://learn.microsoft.com/en-us/microsoftteams/platform/concepts/deploy-and-publish/apps-upload) to a desktop client using the `/appPackage/appPackage.local.zip` file created by the tools and skip to step 6.
-
-1. In a terminal, navigate to `teams-ai/js/samples/01.messaging.a.echobot/`
-
-    ```bash
-    cd teams-ai/js/samples/01.messaging.a.echobot/
-    ```
-
-1. Run ngrok tunneling service - point to port 3978
-
-    ```bash
-    ngrok http --host-header=rewrite 3978
-    ```
-
-1. Create [Bot Framework registration resource](https://docs.microsoft.com/en-us/azure/bot-service/bot-service-quickstart-registration) in Azure
-
-    - Use the current `https` URL you were given by running ngrok. Append with the path `/api/messages` used by this sample.
-    - Ensure that you've [enabled the Teams Channel](https://docs.microsoft.com/en-us/azure/bot-service/channel-connect-teams?view=azure-bot-service-4.0)
-
-1. Update the `.env` configuration for the bot to use the Microsoft App Id and App Password from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the Azure Portal and you can always create a new client secret anytime.)
-
-1. **_This step is specific to Teams._**
-
-    - **Edit** the `manifest.json` contained in the `appPackage` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) _everywhere_ you see the place holder string `${{TEAMS_APP_ID}}` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`). If you haven't created an Azure app service yet, you can use your bot id for the above. You're bot id should be pasted in where you see `${{BOT_ID}}`. Replace everywhere you see `${{BOT_DOMAIN}}` with the domain part of the URL created by your tunneling solution.
-    - **Zip** up the contents of the `appPackage` folder to create a `manifest.zip`
+## Interacting with the bot
 
-1. Run your app from the command line:
+In the chat window of the Teams client, you can interact with the bot by sending it a message. The bot will echo back the message you sent.
+## Other ways to run the sample
+### Teams Toolkit CLI
 
-    ```bash
-    yarn start
-    ```
+[TeamsFx command line interface](https://learn.microsoft.com/microsoftteams/platform/toolkit/teamsfx-cli?pivots=version-two) is a text-based command line interface that accelerates Teams application development. It aims to provide keyboard centric experience while building Teams applications.
 
-1. [Upload the app](https://learn.microsoft.com/en-us/microsoftteams/platform/concepts/deploy-and-publish/apps-upload) file (manifest.zip created in the previous step) in Teams.
+Navigate to [Teams Toolkit CLI](https://github.com/microsoft/teams-ai/tree/main/getting-started/OTHER/TEAMS-TOOLKIT.md#teams-toolkit-cli) for setup instructions.
 
-## Testing in BotFramework Emulator
+### Manual resource management and uploading to Teams
 
-[Bot Framework Emulator](https://github.com/microsoft/BotFramework-Emulator) Allows testing bots independently from Channels when developing your bot. If you do not wish to use Teams Toolkit, please follow the steps below to test your bot in Emulator.
+[Manual resource setup](../../../getting-started/OTHER/MANUAL-RESOURCE-SETUP.md) provides instructions on how to manually create the Azure Bot Resources and upload the app to Teams.
 
-### Directions
+These directions are useful if you do not wish to use Teams Toolkit or you already have resources created and deployed.
 
-1. Download and install [Bot Framework Emulator](https://github.com/microsoft/BotFramework-Emulator)
-2. Launch Bot Framework Emulator
-3. Run the app you are in the directory for.
+If you are doing manual setup, you can ignore the `env` folder entirely.
 
-```bash
-yarn start
-```
+### BotFramework Emulator
 
-4. Add your app's messaging endpoint to the "Open a Bot" dialog. The endpoint your localhost endpoint with the path `/api/messages` appended. It should look something like this: `http://localhost:3978/api/messages`.
+[Bot Framework Emulator](https://github.com/microsoft/BotFramework-Emulator) Allows testing bots independently from channels when developing your bot if you do not wish to use Teams Toolkit.
 
-![Bot Framework setup menu with a localhost url endpoint added under Bot URL](https://github.com/microsoft/teams-ai/assets/14900841/6c4f29bc-3e5c-4df1-b618-2b5a590e420e)
+[Running BF Emulator](../../../getting-started/OTHER/BOTFRAMEWORK-EMULATOR.md) directions provide instructions on how to run the bot in Emulator.
 
--   In order to test remote apps, you will need to use a tunneling service like ngrok along with an Microsoft App Id and password pasted into the dialog shown above.
--   Channel-specific features (For example, Teams Message Extensions) are not supported in Emulator and therefore not fully-testable.
--   If you are building, testing and publishing your app manually to Azure, you will need to put your credentials in the `.env` file.
+> Note: Emulator is channel-agnostic, meaning that features specific to Teams will not be testable in Emulator.
 
 ## Deploy the bot to Azure
 
-You can use Teams Toolkit for VS Code or CLI to host the bot in Azure. The sample includes Bicep templates in the `/infra` directory which are used by the tools to create resources in Azure. Use the **Provision** and **Deploy** menus of the Teams Toolkit extension or from the CLI with `teamsfx provision` and `teamsfx deploy`. [Visit the documentation](https://learn.microsoft.com/en-us/microsoftteams/platform/toolkit/provision) for more info on hosting your app in Azure with Teams Toolkit.
+You can use Teams Toolkit for VS Code or CLI to host the bot in Azure. The sample includes Bicep templates in the `/infra` directory which are used by the tools to create resources in Azure.
+* Use the **Provision** and **Deploy** menus of the Teams Toolkit extension
+* Run CLI commands `teamsfx provision` and `teamsfx deploy`.
+* [Visit the documentation](https://learn.microsoft.com/microsoftteams/platform/toolkit/provision) for more info on hosting your app in Azure with Teams Toolkit.
 
 Alternatively, you can learn more about deploying a bot to Azure manually in the [Deploy your bot to Azure](https://aka.ms/azuredeployment) documentation.
 
 ## Further reading
 
--   [Teams Toolkit overview](https://learn.microsoft.com/en-us/microsoftteams/platform/toolkit/teams-toolkit-fundamentals)
--   [How Microsoft Teams bots work](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-basics-teams?view=azure-bot-service-4.0&tabs=javascript)
+-   [Getting started with Teams AI](../../../getting-started/README.md)
+   - Introduces the Teams AI Library and reviews bot and AI-related concepts
+-   [Teams Toolkit overview](https://learn.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals)
+-   [How Microsoft Teams bots work](https://docs.microsoft.com/azure/bot-service/bot-builder-basics-teams?view=azure-bot-service-4.0&tabs=javascript)
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`MicrosoftAppId=`
`2`	`2`	`MicrosoftAppPassword=`
	`3`	`+#This sample does not use AI and therefore an AI service key is not required.`