diff --git a/src/ai/.x/templates/includes/openai.js/Main.js b/src/ai/.x/templates/includes/openai.js/Main.js
new file mode 100644
index 00000000..5adaa9ec
--- /dev/null
+++ b/src/ai/.x/templates/includes/openai.js/Main.js
@@ -0,0 +1,52 @@
+{{if {_IS_LEARN_DOC_TEMPLATE}}}
+const { AzureOpenAI } = require("openai");
+{{else}}
+const { OpenAI } = require("openai");
+const { {ClassName} } = require("./OpenAIChatCompletionsClass");
+const { readline } = require("./ReadLineWrapper");
+{{endif}}
+
+{{if {_IS_LEARN_DOC_TEMPLATE}}}
+// Load the .env file if it exists
+const dotenv = require("dotenv");
+dotenv.config();
+
+// You will need to set these environment variables or edit the following values
+const endpoint = process.env["AZURE_OPENAI_ENDPOINT"] || "<endpoint>";
+const apiKey = process.env["AZURE_OPENAI_API_KEY"] || "<api key>";
+const apiVersion = "2024-05-01-preview";
+const deployment = "gpt-4o"; //This must match your deployment name.
+require("dotenv/config");
+{{endif}}
+
+async function main() {
+{{@include openai.js/create.openai.js}}
+{{if {_IS_LEARN_DOC_TEMPLATE}}}
+  for (const choice of result.choices) {
+    console.log(choice.message);
+  }
+}
+{{else}}
+  // Loop until the user types 'exit'
+  while (true) {
+
+    // Get user input
+    const input = await readline.question('User: ');
+    if (input === 'exit' || input === '') break;
+
+    // Get the response
+    const response = await chat.getResponse(input);
+    process.stdout.write(`\nAssistant: ${response}\n\n`);
+  }
+
+  console.log('Bye!');
+  process.exit();
+}
+{{endif}}
+
+main().catch((err) => {
+  console.error("The sample encountered an error:", err);
+  process.exit(1);
+});
+
+module.exports = { main };
\ No newline at end of file
diff --git a/src/ai/.x/templates/includes/openai.js/create.openai.js b/src/ai/.x/templates/includes/openai.js/create.openai.js
index 935c0f01..243d5e21 100644
--- a/src/ai/.x/templates/includes/openai.js/create.openai.js
+++ b/src/ai/.x/templates/includes/openai.js/create.openai.js
@@ -14,222 +14,47 @@
 {{if {_USE_OPENAI_CLOUD_AZURE} && {_USE_OPENAI_CLOUD_OPENAI}}}
   {{set _USE_OPENAI_CLOUD_EITHER=true}}
 {{endif}}
-{{if {_USE_OPENAI_CLOUD_OPENAI} || {_USE_AZURE_OPENAI_WITH_KEY}}}
+{{if !{_IS_LEARN_DOC_TEMPLATE}}}
+  // What's the system prompt?
+  const AZURE_OPENAI_SYSTEM_PROMPT = process.env.AZURE_OPENAI_SYSTEM_PROMPT ?? "You are a helpful AI assistant.";
+
+  {{if {_USE_OPENAI_CLOUD_OPENAI} || {_USE_AZURE_OPENAI_WITH_KEY}}}
   // NOTE: Never deploy your API Key in client-side environments like browsers or mobile apps
   // SEE: https://help.openai.com/en/articles/5112595-best-practices-for-api-key-safety
-
+  {{endif}}
 {{endif}}
-  // Get the required environment variables
+{{@include openai.js/environment.vars.js}}
 {{if {_USE_OPENAI_CLOUD_AZURE}}}
-  {{if {_USE_AZURE_OPENAI_WITH_KEY}}}
-  const AZURE_OPENAI_API_KEY = {__process_env_or_import_meta_env}.AZURE_OPENAI_API_KEY ?? "<insert your Azure OpenAI API key here>";
-  {{else if {_IS_BROWSER_TEMPLATE}}}
-  const AZURE_CLIENT_ID = {__process_env_or_import_meta_env}.AZURE_CLIENT_ID ?? null;
-  const AZURE_TENANT_ID = {__process_env_or_import_meta_env}.AZURE_TENANT_ID ?? null;
+  {{if {_IS_LEARN_DOC_TEMPLATE}}}
+  {{if {_TEMPLATE_AUTHOR_COMMENT} }}
+  // There's likely opportunity to further reduce here and force more overlap across
+  // all of our samples. For the time being, keeping this unique/separate for the initial
+  // pitch to showcase the integration with Learn docs.
   {{endif}}
-  const AZURE_OPENAI_API_VERSION = {__process_env_or_import_meta_env}.AZURE_OPENAI_API_VERSION ?? "<insert your Azure OpenAI API version here>";
-  {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
-  const AZURE_OPENAI_CHAT_DEPLOYMENT = {__process_env_or_import_meta_env}.AZURE_OPENAI_CHAT_DEPLOYMENT ?? "<insert your Azure OpenAI chat deployment name here>";
-  {{endif}}
-  const AZURE_OPENAI_ENDPOINT = {__process_env_or_import_meta_env}.AZURE_OPENAI_ENDPOINT ?? "<insert your Azure OpenAI endpoint here>";
-  {{if {_IS_OPENAI_ASST_TEMPLATE}}}
-  const AZURE_OPENAI_BASE_URL = `${AZURE_OPENAI_ENDPOINT.replace(/\/+$/, '')}/openai`;
+  const client = new AzureOpenAI({ endpoint, apiKey, apiVersion, deployment });
+  const result = await client.chat.completions.create({
+    messages: [
+    { role: "system", content: "You are a helpful assistant." },
+    { role: "user", content: "Does Azure OpenAI support customer managed keys?" },
+    { role: "assistant", content: "Yes, customer managed keys are supported by Azure OpenAI?" },
+    { role: "user", content: "Do other Azure AI services support this too?" },
+    ],
+    model: "",
+  });
   {{else}}
-  const AZURE_OPENAI_BASE_URL = `${AZURE_OPENAI_ENDPOINT.replace(/\/+$/, '')}/openai/deployments/${AZURE_OPENAI_CHAT_DEPLOYMENT}`;
-  {{endif}}
-  {{if {_USE_OPENAI_CLOUD_OPENAI}}}
-
-  {{endif}}
-{{endif}}
-{{if {_USE_OPENAI_CLOUD_OPENAI}}}
-  const OPENAI_API_KEY = {__process_env_or_import_meta_env}.OPENAI_API_KEY ?? "<insert your OpenAI API key here>";
-  {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
-  const OPENAI_MODEL_NAME = {__process_env_or_import_meta_env}.OPENAI_MODEL_NAME ?? "<insert your OpenAI model name here>";
-  {{endif}}
-  const OPENAI_ORG_ID = {__process_env_or_import_meta_env}.OPENAI_ORG_ID ?? null;
-{{endif}}
-
-  // Check if the required environment variables are set
-{{if {_USE_OPENAI_CLOUD_AZURE}}}
-  const azureOk = 
-    {{if {_USE_AZURE_OPENAI_WITH_KEY}}}
-    AZURE_OPENAI_API_KEY != null && !AZURE_OPENAI_API_KEY.startsWith('<insert') &&
-    {{else if {_IS_BROWSER_TEMPLATE}}}
-    AZURE_CLIENT_ID != null && !AZURE_CLIENT_ID.startsWith('<insert') &&
-    AZURE_TENANT_ID != null && !AZURE_TENANT_ID.startsWith('<insert') &&
-    {{endif}}
-    AZURE_OPENAI_API_VERSION != null && !AZURE_OPENAI_API_VERSION.startsWith('<insert') &&
-    {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
-    AZURE_OPENAI_CHAT_DEPLOYMENT != null && !AZURE_OPENAI_CHAT_DEPLOYMENT.startsWith('<insert') &&
-    {{endif}}
-    AZURE_OPENAI_ENDPOINT != null && !AZURE_OPENAI_ENDPOINT.startsWith('<insert');
-    {{if {_USE_OPENAI_CLOUD_OPENAI}}}
-
-    {{endif}}
-{{endif}}
-{{if {_USE_OPENAI_CLOUD_OPENAI}}}
-  const openaiOk =
-    {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
-    OPENAI_MODEL_NAME != null && !OPENAI_MODEL_NAME.startsWith('<insert') &&
-    {{endif}}
-    OPENAI_API_KEY != null && !OPENAI_API_KEY.startsWith('<insert');
-{{endif}}
-
-{{if {_USE_OPENAI_CLOUD_EITHER}}}
-  const ok = (azureOk || openaiOk) &&
-{{else if {_USE_OPENAI_CLOUD_AZURE}}}
-  const ok = azureOk &&
-{{else}}
-  const ok = openaiOk &&
-{{endif}}
-{{if {_IS_OPENAI_ASST_TEMPLATE}}}
-    ASSISTANT_ID != null && !ASSISTANT_ID.startsWith('<insert');
-{{else}}
-    AZURE_OPENAI_SYSTEM_PROMPT != null && !AZURE_OPENAI_SYSTEM_PROMPT.startsWith('<insert');
-{{endif}}
-
-  if (!ok) {
-{{if {_USE_OPENAI_CLOUD_AZURE}}}
-    {{if {_IS_BROWSER_TEMPLATE}}}
-    chatPanelAppendMessage('computer', markdownToHtml(
-    {{else}}
-    console.error(
-    {{endif}}
-      'To use Azure OpenAI, set the following environment variables:\n' +
-    {{if {_IS_OPENAI_ASST_TEMPLATE}}}
-      '\n  ASSISTANT_ID' +
-    {{else}}
-      '\n  AZURE_OPENAI_SYSTEM_PROMPT' +
-    {{endif}}
-    {{if {_USE_AZURE_OPENAI_WITH_KEY}}}
-      '\n  AZURE_OPENAI_API_KEY' +
-    {{else}}
-      {{if {_IS_BROWSER_TEMPLATE}}}
-      '\n  AZURE_CLIENT_ID' +
-      '\n  AZURE_TENANT_ID' +
-      {{endif}}
-    {{endif}}
-      '\n  AZURE_OPENAI_API_VERSION' +
-    {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
-      '\n  AZURE_OPENAI_CHAT_DEPLOYMENT' +
-    {{endif}}
-      '\n  AZURE_OPENAI_ENDPOINT'
-    {{if {_IS_BROWSER_TEMPLATE}}}
-    ));
-    {{else}}
-    );
-    {{endif}}
-    {{if {_IS_BROWSER_TEMPLATE}}}
-    chatPanelAppendMessage('computer', markdownToHtml(
-      '\nYou can easily do that using the Azure AI CLI by doing one of the following:\n' +
-      '\n  ai init' +
-      '\n  ai dev new .env' +
-      '\n  npm run webpack' +
-      '\n' +
-      '\n  or' +
-      '\n' +
-      '\n  ai init' +
-      '\n  ai dev shell' +
-      '\n  npm run webpack' +
-      '\n' +
-      '\n  or' +
-      '\n' +
-      '\n  ai init' +
-      '\n  ai dev shell --run "npm run webpack"'
-    ));
-    {{else}}
-    console.error(
-      '\nYou can easily do that using the Azure AI CLI by doing one of the following:\n' +
-      '\n  ai init' +
-      '\n  ai dev shell' +
-      '\n  node main.js' +
-      '\n' +
-      '\n  or' +
-      '\n' +
-      '\n  ai init' +
-      '\n  ai dev shell --run "node main.js"'
-    );
-    {{endif}}
-    {{if {_USE_OPENAI_CLOUD_OPENAI}}}
-
-    {{endif}}
-{{endif}}
-{{if {_USE_OPENAI_CLOUD_OPENAI}}}
-    {{if {_IS_BROWSER_TEMPLATE}}}
-    chatPanelAppendMessage('computer', markdownToHtml(
-    {{else}}
-    console.error(
-    {{endif}}
-      'To use OpenAI, set the following environment variables:\n' +
-      '\n  OPENAI_API_KEY' +
-      '\n  OPENAI_ORG_ID (optional)' +
-      {{if {_IS_OPENAI_ASST_TEMPLATE}}}
-      '\n  ASSISTANT_ID'
-      {{else}}
-      '\n  OPENAI_MODEL_NAME' +
-      '\n  AZURE_OPENAI_SYSTEM_PROMPT'
-      {{endif}}
-    {{if {_IS_BROWSER_TEMPLATE}}}
-    ));
-    {{else}}
-    );
-    {{endif}}
-    {{if {_IS_BROWSER_TEMPLATE}}}
-    chatPanelAppendMessage('computer', markdownToHtml(
-    {{else}}
-    console.error(
-    {{endif}}
-      '\nYou can easily obtain some of these values by visiting these links:\n' +
-      '\n  https://platform.openai.com/api-keys' +
-      '\n  https://platform.openai.com/settings/organization/general' +
-      '\n  https://platform.openai.com/playground/assistants' +
-      '\n' +
-    {{if {_IS_BROWSER_TEMPLATE}}}
-      '\n Then, do one of the following:\n' +
-      '\n  ai dev new .env' +
-      '\n  npm run webpack' +
-      '\n' +
-      '\n  or' +
-      '\n' +
-      '\n  ai dev shell' +
-      '\n  npm run webpack' +
-      '\n' +
-      '\n  or' +
-      '\n' +
-      '\n  ai dev shell --run "npm run webpack"'
-    ));
-    {{else}}
-      '\n Then, do one of the following:\n' +
-      '\n  ai dev shell' +
-      '\n  node main.js' +
-      '\n' +
-      '\n  or' +
-      '\n' +
-      '\n  ai dev shell --run "node main.js"'
-    );
-    {{endif}}
-{{endif}}
-{{if {_IS_BROWSER_TEMPLATE}}}
-    throw new Error('Missing required environment variables');
-{{else}}
-    process.exit(1);
-{{endif}}
-  }
-
-{{if {_USE_OPENAI_CLOUD_AZURE}}}
   {{if {_USE_OPENAI_CLOUD_OPENAI}}}
-  // Create the OpenAI client
+  // Create the AzureOpenAI client
   console.log(azureOk
     ? 'Using Azure OpenAI (w/ API Key)...'
     : 'Using OpenAI...');
-  const openai = !azureOk
-    ? new OpenAI({
+  const client = !azureOk
+    ? new AzureOpenAI({
         apiKey: OPENAI_API_KEY,
         {{if {_IS_BROWSER_TEMPLATE}}}
         dangerouslyAllowBrowser: true
         {{endif}}
       })
-    : new OpenAI({
+    : new AzureOpenAI({
         apiKey: AZURE_OPENAI_API_KEY,
         baseURL: AZURE_OPENAI_BASE_URL,
         defaultQuery: { 'api-version': AZURE_OPENAI_API_VERSION },
@@ -239,9 +64,9 @@
         {{endif}}
       });
   {{else if {_USE_AZURE_OPENAI_WITH_KEY}}}
-  // Create the OpenAI client
+  // Create the AzureOpenAI client
   console.log('Using Azure OpenAI (w/ API Key)...');
-  const openai = new OpenAI({
+  const client = new AzureOpenAI({
     apiKey: AZURE_OPENAI_API_KEY,
     baseURL: AZURE_OPENAI_BASE_URL,
     defaultQuery: { 'api-version': AZURE_OPENAI_API_VERSION },
@@ -271,9 +96,9 @@
     throw error;  
   }
 
-  // Create the OpenAI client
+  // Create the AzureOpenAI client
   console.log('Using Azure OpenAI (w/ AAD)...');
-  const openai = new OpenAI({
+  const client = new AzureOpenAI({
     apiKey: '',
     baseURL: AZURE_OPENAI_BASE_URL,
     defaultQuery: { 'api-version': AZURE_OPENAI_API_VERSION },
@@ -283,6 +108,7 @@
     {{endif}}
   });
   {{endif}}
+  {{endif}}
 {{else}}
   // Create the OpenAI client
   console.log('Using OpenAI...');
@@ -293,4 +119,17 @@
     dangerouslyAllowBrowser: true
     {{endif}}
   });
+{{endif}}
+
+{{if {_TEMPLATE_AUTHOR_COMMENT} }}
+// For some Learn docs and snippets, error handling or additional helpers are excluded to keep
+// the code scoped and focused on the main concept being showcased.
+{{endif}}
+{{if !{_IS_LEARN_DOC_TEMPLATE}}}
+  // Create the streaming chat completions helper
+  {{if contains(toupper("{OPENAI_CLOUD}"), "AZURE")}}
+  const chat = new {ClassName}(AZURE_OPENAI_CHAT_DEPLOYMENT, AZURE_OPENAI_SYSTEM_PROMPT, client);
+  {{else}}
+  const chat = new {ClassName}(OPENAI_MODEL_NAME, AZURE_OPENAI_SYSTEM_PROMPT, openai);
+  {{endif}}
 {{endif}}
\ No newline at end of file
diff --git a/src/ai/.x/templates/includes/openai.js/environment.vars.js b/src/ai/.x/templates/includes/openai.js/environment.vars.js
new file mode 100644
index 00000000..0422ce49
--- /dev/null
+++ b/src/ai/.x/templates/includes/openai.js/environment.vars.js
@@ -0,0 +1,201 @@
+{{if !{_IS_LEARN_DOC_TEMPLATE}}}
+// Get the required environment variables
+{{if {_USE_OPENAI_CLOUD_AZURE}}}
+  {{if {_USE_AZURE_OPENAI_WITH_KEY}}}
+  const AZURE_OPENAI_API_KEY = {__process_env_or_import_meta_env}.AZURE_OPENAI_API_KEY ?? "<insert your Azure OpenAI API key here>";
+  {{else if {_IS_BROWSER_TEMPLATE}}}
+  const AZURE_CLIENT_ID = {__process_env_or_import_meta_env}.AZURE_CLIENT_ID ?? null;
+  const AZURE_TENANT_ID = {__process_env_or_import_meta_env}.AZURE_TENANT_ID ?? null;
+  {{endif}}
+  const AZURE_OPENAI_API_VERSION = {__process_env_or_import_meta_env}.AZURE_OPENAI_API_VERSION ?? "<insert your Azure OpenAI API version here>";
+  {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
+  const AZURE_OPENAI_CHAT_DEPLOYMENT = {__process_env_or_import_meta_env}.AZURE_OPENAI_CHAT_DEPLOYMENT ?? "<insert your Azure OpenAI chat deployment name here>";
+  {{endif}}
+  const AZURE_OPENAI_ENDPOINT = {__process_env_or_import_meta_env}.AZURE_OPENAI_ENDPOINT ?? "<insert your Azure OpenAI endpoint here>";
+  {{if {_IS_OPENAI_ASST_TEMPLATE}}}
+  const AZURE_OPENAI_BASE_URL = `${AZURE_OPENAI_ENDPOINT.replace(/\/+$/, '')}/openai`;
+  {{else}}
+  const AZURE_OPENAI_BASE_URL = `${AZURE_OPENAI_ENDPOINT.replace(/\/+$/, '')}/openai/deployments/${AZURE_OPENAI_CHAT_DEPLOYMENT}`;
+  {{endif}}
+{{endif}}
+{{endif}}
+{{if {_USE_OPENAI_CLOUD_OPENAI}}}
+  const OPENAI_API_KEY = {__process_env_or_import_meta_env}.OPENAI_API_KEY ?? "<insert your OpenAI API key here>";
+  {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
+  const OPENAI_MODEL_NAME = {__process_env_or_import_meta_env}.OPENAI_MODEL_NAME ?? "<insert your OpenAI model name here>";
+  {{endif}}
+  const OPENAI_ORG_ID = {__process_env_or_import_meta_env}.OPENAI_ORG_ID ?? null;
+{{endif}}
+
+{{if {_TEMPLATE_AUTHOR_COMMENT} }}
+// For some Learn docs and snippets, error handling or additional checks are excluded to keep
+// the code scoped and focused on the main concept being showcased.
+{{endif}}
+{{if !{_IS_LEARN_DOC_TEMPLATE}}}
+// Check if the required environment variables are set
+{{if {_USE_OPENAI_CLOUD_AZURE}}}
+  const azureOk = 
+    {{if {_USE_AZURE_OPENAI_WITH_KEY}}}
+    AZURE_OPENAI_API_KEY != null && !AZURE_OPENAI_API_KEY.startsWith('<insert') &&
+    {{else if {_IS_BROWSER_TEMPLATE}}}
+    AZURE_CLIENT_ID != null && !AZURE_CLIENT_ID.startsWith('<insert') &&
+    AZURE_TENANT_ID != null && !AZURE_TENANT_ID.startsWith('<insert') &&
+    {{endif}}
+    AZURE_OPENAI_API_VERSION != null && !AZURE_OPENAI_API_VERSION.startsWith('<insert') &&
+    {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
+    AZURE_OPENAI_CHAT_DEPLOYMENT != null && !AZURE_OPENAI_CHAT_DEPLOYMENT.startsWith('<insert') &&
+    {{endif}}
+    AZURE_OPENAI_ENDPOINT != null && !AZURE_OPENAI_ENDPOINT.startsWith('<insert');
+    {{if {_USE_OPENAI_CLOUD_OPENAI}}}
+
+    {{endif}}
+{{endif}}
+{{if {_USE_OPENAI_CLOUD_OPENAI}}}
+  const openaiOk =
+    {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
+    OPENAI_MODEL_NAME != null && !OPENAI_MODEL_NAME.startsWith('<insert') &&
+    {{endif}}
+    OPENAI_API_KEY != null && !OPENAI_API_KEY.startsWith('<insert');
+{{endif}}
+
+{{if {_USE_OPENAI_CLOUD_EITHER}}}
+  const ok = (azureOk || openaiOk) &&
+{{else if {_USE_OPENAI_CLOUD_AZURE}}}
+  const ok = azureOk &&
+{{else}}
+  const ok = openaiOk &&
+{{endif}}
+{{if {_IS_OPENAI_ASST_TEMPLATE}}}
+    ASSISTANT_ID != null && !ASSISTANT_ID.startsWith('<insert');
+{{else}}
+    AZURE_OPENAI_SYSTEM_PROMPT != null && !AZURE_OPENAI_SYSTEM_PROMPT.startsWith('<insert');
+{{endif}}
+
+  if (!ok) {
+{{if {_USE_OPENAI_CLOUD_AZURE}}}
+    {{if {_IS_BROWSER_TEMPLATE}}}
+    chatPanelAppendMessage('computer', markdownToHtml(
+    {{else}}
+    console.error(
+    {{endif}}
+      'To use Azure OpenAI, set the following environment variables:\n' +
+    {{if {_IS_OPENAI_ASST_TEMPLATE}}}
+      '\n  ASSISTANT_ID' +
+    {{else}}
+      '\n  AZURE_OPENAI_SYSTEM_PROMPT' +
+    {{endif}}
+    {{if {_USE_AZURE_OPENAI_WITH_KEY}}}
+      '\n  AZURE_OPENAI_API_KEY' +
+    {{else}}
+      {{if {_IS_BROWSER_TEMPLATE}}}
+      '\n  AZURE_CLIENT_ID' +
+      '\n  AZURE_TENANT_ID' +
+      {{endif}}
+    {{endif}}
+      '\n  AZURE_OPENAI_API_VERSION' +
+    {{if !{_IS_OPENAI_ASST_TEMPLATE}}}
+      '\n  AZURE_OPENAI_CHAT_DEPLOYMENT' +
+    {{endif}}
+      '\n  AZURE_OPENAI_ENDPOINT'
+    {{if {_IS_BROWSER_TEMPLATE}}}
+    ));
+    {{else}}
+    );
+    {{endif}}
+    {{if {_IS_BROWSER_TEMPLATE}}}
+    chatPanelAppendMessage('computer', markdownToHtml(
+      '\nYou can easily do that using the Azure AI CLI by doing one of the following:\n' +
+      '\n  ai init' +
+      '\n  ai dev new .env' +
+      '\n  npm run webpack' +
+      '\n' +
+      '\n  or' +
+      '\n' +
+      '\n  ai init' +
+      '\n  ai dev shell' +
+      '\n  npm run webpack' +
+      '\n' +
+      '\n  or' +
+      '\n' +
+      '\n  ai init' +
+      '\n  ai dev shell --run "npm run webpack"'
+    ));
+    {{else}}
+    console.error(
+      '\nYou can easily do that using the Azure AI CLI by doing one of the following:\n' +
+      '\n  ai init' +
+      '\n  ai dev shell' +
+      '\n  node main.js' +
+      '\n' +
+      '\n  or' +
+      '\n' +
+      '\n  ai init' +
+      '\n  ai dev shell --run "node main.js"'
+    );
+    {{endif}}
+    {{if {_USE_OPENAI_CLOUD_OPENAI}}}
+
+    {{endif}}
+{{endif}}
+{{if {_USE_OPENAI_CLOUD_OPENAI}}}
+    {{if {_IS_BROWSER_TEMPLATE}}}
+    chatPanelAppendMessage('computer', markdownToHtml(
+    {{else}}
+    console.error(
+    {{endif}}
+      'To use OpenAI, set the following environment variables:\n' +
+      '\n  OPENAI_API_KEY' +
+      '\n  OPENAI_ORG_ID (optional)' +
+      {{if {_IS_OPENAI_ASST_TEMPLATE}}}
+      '\n  ASSISTANT_ID'
+      {{else}}
+      '\n  OPENAI_MODEL_NAME' +
+      '\n  AZURE_OPENAI_SYSTEM_PROMPT'
+      {{endif}}
+    {{if {_IS_BROWSER_TEMPLATE}}}
+    ));
+    {{else}}
+    );
+    {{endif}}
+    {{if {_IS_BROWSER_TEMPLATE}}}
+    chatPanelAppendMessage('computer', markdownToHtml(
+    {{else}}
+    console.error(
+    {{endif}}
+      '\nYou can easily obtain some of these values by visiting these links:\n' +
+      '\n  https://platform.openai.com/api-keys' +
+      '\n  https://platform.openai.com/settings/organization/general' +
+      '\n  https://platform.openai.com/playground/assistants' +
+      '\n' +
+    {{if {_IS_BROWSER_TEMPLATE}}}
+      '\n Then, do one of the following:\n' +
+      '\n  ai dev new .env' +
+      '\n  npm run webpack' +
+      '\n' +
+      '\n  or' +
+      '\n' +
+      '\n  ai dev shell' +
+      '\n  npm run webpack' +
+      '\n' +
+      '\n  or' +
+      '\n' +
+      '\n  ai dev shell --run "npm run webpack"'
+    ));
+    {{else}}
+      '\n Then, do one of the following:\n' +
+      '\n  ai dev shell' +
+      '\n  node main.js' +
+      '\n' +
+      '\n  or' +
+      '\n' +
+      '\n  ai dev shell --run "node main.js"'
+    );
+    {{endif}}
+{{endif}}
+{{if {_IS_BROWSER_TEMPLATE}}}
+    throw new Error('Missing required environment variables');
+{{else}}
+    process.exit(1);
+{{endif}}
+  }
+{{endif}}
\ No newline at end of file
diff --git a/src/ai/.x/templates/openai-chat-js/Main.js b/src/ai/.x/templates/openai-chat-js/Main.js
index c68b9d35..07ce0d64 100644
--- a/src/ai/.x/templates/openai-chat-js/Main.js
+++ b/src/ai/.x/templates/openai-chat-js/Main.js
@@ -1,40 +1 @@
-const { OpenAI } = require('openai');
-const { {ClassName} } = require("./OpenAIChatCompletionsClass");
-const { readline } = require("./ReadLineWrapper");
-
-async function main() {
-
-  // What's the system prompt?
-  const AZURE_OPENAI_SYSTEM_PROMPT = process.env.AZURE_OPENAI_SYSTEM_PROMPT ?? "You are a helpful AI assistant.";
-
-  {{@include openai.js/create.openai.js}}
-
-  // Create the streaming chat completions helper
-  {{if contains(toupper("{OPENAI_CLOUD}"), "AZURE")}}
-  const chat = new {ClassName}(AZURE_OPENAI_CHAT_DEPLOYMENT, AZURE_OPENAI_SYSTEM_PROMPT, openai);
-  {{else}}
-  const chat = new {ClassName}(OPENAI_MODEL_NAME, AZURE_OPENAI_SYSTEM_PROMPT, openai);
-  {{endif}}
-  
-  // Loop until the user types 'exit'
-  while (true) {
-
-    // Get user input
-    const input = await readline.question('User: ');
-    if (input === 'exit' || input === '') break;
-
-    // Get the response
-    const response = await chat.getResponse(input);
-    process.stdout.write(`\nAssistant: ${response}\n\n`);
-  }
-
-  console.log('Bye!');
-  process.exit();
-}
-
-main().catch((err) => {
-  console.error("The sample encountered an error:", err);
-  process.exit(1);
-});
-
-module.exports = { main };
+{{@include openai.js/Main.js}}
diff --git a/src/ai/.x/templates/openai-chat-js/_.json b/src/ai/.x/templates/openai-chat-js/_.json
index ce31afbb..ae61c609 100644
--- a/src/ai/.x/templates/openai-chat-js/_.json
+++ b/src/ai/.x/templates/openai-chat-js/_.json
@@ -10,5 +10,8 @@
   "_IS_BROWSER_TEMPLATE": "false",
   "_IMPORT_EXPORT_USING_ES6": "false",
   "__process_env_or_import_meta_env": "process.env",
-  "_IS_OPENAI_ASST_TEMPLATE": "false"
+  "_IS_OPENAI_ASST_TEMPLATE": "false",
+  "_IS_LEARN_DOC_TEMPLATE": "false",
+  "_TEMPLATE_AUTHOR_COMMENT": "false",
+  "_IS_STUDIO_VIEW_CODE_TEMPLATE": "false"
 }
\ No newline at end of file
diff --git a/src/ai/.x/templates/openai-chat-js/package.json b/src/ai/.x/templates/openai-chat-js/package.json
index ff130119..a43dd84e 100644
--- a/src/ai/.x/templates/openai-chat-js/package.json
+++ b/src/ai/.x/templates/openai-chat-js/package.json
@@ -13,5 +13,4 @@
       "@azure/identity": "4.1.0",
       "openai": "^4.31.0"
     }
-  }
-  
\ No newline at end of file
+}
diff --git a/src/ai/.x/templates/openai-chat-learndocs-js/Main.js b/src/ai/.x/templates/openai-chat-learndocs-js/Main.js
new file mode 100644
index 00000000..07ce0d64
--- /dev/null
+++ b/src/ai/.x/templates/openai-chat-learndocs-js/Main.js
@@ -0,0 +1 @@
+{{@include openai.js/Main.js}}
diff --git a/src/ai/.x/templates/openai-chat-learndocs-js/_.json b/src/ai/.x/templates/openai-chat-learndocs-js/_.json
new file mode 100644
index 00000000..276d0958
--- /dev/null
+++ b/src/ai/.x/templates/openai-chat-learndocs-js/_.json
@@ -0,0 +1,17 @@
+{
+  "_LongName": "OpenAI Chat Completions quickstart docs",
+  "_ShortName": "openai-chat-learndocs",
+  "_Language": "JavaScript",
+
+  "ClassName": "OpenAIChatCompletionsClass",
+  "AZURE_OPENAI_AUTH_METHOD": "KEY",
+  "OPENAI_CLOUD": "Azure",
+
+  "_IS_BROWSER_TEMPLATE": "false",
+  "_IMPORT_EXPORT_USING_ES6": "false",
+  "__process_env_or_import_meta_env": "process.env",
+  "_IS_OPENAI_ASST_TEMPLATE": "false",
+  "_IS_STUDIO_VIEW_CODE_TEMPLATE": "false",
+  "_IS_LEARN_DOC_TEMPLATE": "true",
+  "_TEMPLATE_AUTHOR_COMMENT": "false"
+}
\ No newline at end of file
diff --git a/src/ai/.x/templates/openai-chat-learndocs-js/package.json b/src/ai/.x/templates/openai-chat-learndocs-js/package.json
new file mode 100644
index 00000000..1d7cf5e1
--- /dev/null
+++ b/src/ai/.x/templates/openai-chat-learndocs-js/package.json
@@ -0,0 +1,16 @@
+{
+    "name": "openai-chat-learndocs",
+    "version": "1.0.0",
+    "description": "",
+    "main": "Main.js",
+    "scripts": {
+      "test": "echo \"Error: no test specified\" && exit 1",
+      "webpack": "webpack"
+    },
+    "author": "",
+    "license": "MIT",
+    "dependencies": {
+      "@azure/identity": "4.1.0",
+      "openai": "^4.31.0"
+    }
+}