microsoft · Mar 18, 2025
diff --git a/‎l10n/bundle.l10n.json
+30-1 b/‎l10n/bundle.l10n.json
+30-1
diff --git a/‎loc/translations-export/vscode-powerplatform.xlf
+61-1 b/‎loc/translations-export/vscode-powerplatform.xlf
+61-1
diff --git a/‎package-lock.json
+7-4 b/‎package-lock.json
+7-4
diff --git a/‎package.json
+62-10 b/‎package.json
+62-10
diff --git a/‎package.nls.json
+6-2 b/‎package.nls.json
+6-2
diff --git a/‎serve.json
+13 b/‎serve.json
+13
diff --git a/‎src/client/extension.ts
+5-5 b/‎src/client/extension.ts
+5-5
diff --git a/‎src/client/lib/PacTerminal.ts
+1-1 b/‎src/client/lib/PacTerminal.ts
+1-1
diff --git a/‎src/client/pac/PacWrapper.ts
+5-1 b/‎src/client/pac/PacWrapper.ts
+5-1
diff --git a/‎src/client/power-pages/actions-hub/ActionsHubCommandHandlers.ts
+359-32 b/‎src/client/power-pages/actions-hub/ActionsHubCommandHandlers.ts
+359-32
diff --git a/‎src/client/power-pages/actions-hub/ActionsHubTreeDataProvider.ts
+18-4 b/‎src/client/power-pages/actions-hub/ActionsHubTreeDataProvider.ts
+18-4
diff --git a/‎src/client/power-pages/actions-hub/Constants.ts
+20-3 b/‎src/client/power-pages/actions-hub/Constants.ts
+20-3
diff --git a/‎src/client/power-pages/actions-hub/models/IWebsiteInfo.ts
+1 b/‎src/client/power-pages/actions-hub/models/IWebsiteInfo.ts
+1
diff --git a/‎src/client/power-pages/actions-hub/tree-items/ActionsHubTreeItem.ts
+3-3 b/‎src/client/power-pages/actions-hub/tree-items/ActionsHubTreeItem.ts
+3-3
diff --git a/‎src/client/power-pages/actions-hub/tree-items/ActiveGroupTreeItem.ts
+9-1 b/‎src/client/power-pages/actions-hub/tree-items/ActiveGroupTreeItem.ts
+9-1
diff --git a/‎src/client/power-pages/actions-hub/tree-items/OtherSitesGroupTreeItem.ts
+27-2 b/‎src/client/power-pages/actions-hub/tree-items/OtherSitesGroupTreeItem.ts
+27-2
diff --git a/‎src/client/power-pages/preview-site/Constants.ts
+4-2 b/‎src/client/power-pages/preview-site/Constants.ts
+4-2
diff --git a/‎src/client/power-pages/preview-site/PreviewSite.ts
+60-23 b/‎src/client/power-pages/preview-site/PreviewSite.ts
+60-23
diff --git a/‎src/client/test/Integration/power-pages/actions-hub/ActionsHubCommandHandlers.test.ts
+636-12 b/‎src/client/test/Integration/power-pages/actions-hub/ActionsHubCommandHandlers.test.ts
+636-12
diff --git a/‎src/client/test/Integration/power-pages/actions-hub/ActionsHubTreeDataProvider.test.ts
+63-5 b/‎src/client/test/Integration/power-pages/actions-hub/ActionsHubTreeDataProvider.test.ts
+63-5
diff --git a/‎src/client/test/Integration/power-pages/actions-hub/tree-items/ActionsHubTreeItem.test.ts
+8-2 b/‎src/client/test/Integration/power-pages/actions-hub/tree-items/ActionsHubTreeItem.test.ts
+8-2
diff --git a/‎src/client/test/Integration/power-pages/actions-hub/tree-items/ActiveGroupTreeItem.test.ts
+67-5 b/‎src/client/test/Integration/power-pages/actions-hub/tree-items/ActiveGroupTreeItem.test.ts
+67-5
diff --git a/‎src/client/test/Integration/power-pages/actions-hub/tree-items/OtherSitesGroupTreeItem.test.ts
+5-5 b/‎src/client/test/Integration/power-pages/actions-hub/tree-items/OtherSitesGroupTreeItem.test.ts
+5-5
diff --git a/‎src/client/test/Integration/power-pages/preview-site/PreviewSite.test.ts
+10-10 b/‎src/client/test/Integration/power-pages/preview-site/PreviewSite.test.ts
+10-10
diff --git a/‎src/client/test/Integration/validationDiagnostics.test.ts
+32-16 b/‎src/client/test/Integration/validationDiagnostics.test.ts
+32-16
diff --git a/‎src/common/OneDSLoggerTelemetry/oneDSLogger.ts
+2-2 b/‎src/common/OneDSLoggerTelemetry/oneDSLogger.ts
+2-2
diff --git a/‎src/common/OneDSLoggerTelemetry/oneDSLoggerWrapper.ts
+6-6 b/‎src/common/OneDSLoggerTelemetry/oneDSLoggerWrapper.ts
+6-6
diff --git a/‎src/common/constants.ts
+2 b/‎src/common/constants.ts
+2
diff --git a/‎src/common/copilot/PowerPagesCopilot.ts
+3 b/‎src/common/copilot/PowerPagesCopilot.ts
+3
diff --git a/‎src/common/copilot/assets/scripts/copilot.js
+26-10 b/‎src/common/copilot/assets/scripts/copilot.js
+26-10
diff --git a/‎src/common/copilot/assets/styles/copilot.css
+13-1 b/‎src/common/copilot/assets/styles/copilot.css
+13-1
diff --git a/‎src/common/copilot/dataverseMetadata.ts
+28 b/‎src/common/copilot/dataverseMetadata.ts
+28
diff --git a/‎src/common/copilot/user-feedback/CESSurvey.ts
+1-1 b/‎src/common/copilot/user-feedback/CESSurvey.ts
+1-1
diff --git a/‎src/common/copilot/user-feedback/feedback.css
+1-2 b/‎src/common/copilot/user-feedback/feedback.css
+1-2
diff --git a/‎src/common/services/Interfaces.ts
+18 b/‎src/common/services/Interfaces.ts
+18
@@ -57,6 +57,9 @@
   "Working on it...": "Working on it...",
   "You can use this in <a href=\"#\" id=\"github-copilot-link\">GitHub Copilot with @powerpages</a> and leverage best of both world.": "You can use this in <a href=\"#\" id=\"github-copilot-link\">GitHub Copilot with @powerpages</a> and leverage best of both world.",
   "NEW": "NEW",
+  "Copilot Response": "Copilot Response",
+  "Code Block ": "Code Block ",
+  " End of Code Block ": " End of Code Block ",
   "Copied to clipboard!": "Copied to clipboard!",
   "What do you need help with?": "What do you need help with?",
   "Make sure AI-generated content is accurate and appropriate before using. <a href=\"https://go.microsoft.com/fwlink/?linkid=2240145\">Learn more</a> | <a href=\"https://go.microsoft.com/fwlink/?linkid=2189520\">View\n              terms</a>": "Make sure AI-generated content is accurate and appropriate before using. <a href=\"https://go.microsoft.com/fwlink/?linkid=2240145\">Learn more</a> | <a href=\"https://go.microsoft.com/fwlink/?linkid=2189520\">View\n              terms</a>",
@@ -109,7 +112,6 @@
     ]
   },
   "Opening site preview...": "Opening site preview...",
-  "The preview shown is for published changes.": "The preview shown is for published changes.",
   "Site runtime preview feature is not enabled.": "Site runtime preview feature is not enabled.",
   "No workspace folder opened. Please open a site folder to preview.": "No workspace folder opened. Please open a site folder to preview.",
   "Initializing site preview. Please try again after few seconds.": "Initializing site preview. Please try again after few seconds.",
@@ -129,6 +131,8 @@
   },
   "Authenticating...": "Authenticating...",
   "Unable to clear cache": "Unable to clear cache",
+  "Your preview isn't updated. Please upload your site to see the latest changes.": "Your preview isn't updated. Please upload your site to see the latest changes.",
+  "Upload changes": "Upload changes",
   "Enter the name of the web template": "Enter the name of the web template",
   "Please enter a name for the web template.": "Please enter a name for the web template.",
   "A webtemplate with the same name already exists. Please enter a different name.": "A webtemplate with the same name already exists. Please enter a different name.",
@@ -193,6 +197,13 @@
   "Changing environment...": "Changing environment...",
   "Current": "Current",
   "Site management URL not found for the selected site. Please try again after refreshing the environment.": "Site management URL not found for the selected site. Please try again after refreshing the environment.",
+  "Be careful when you're updating public sites. The changes you make are visible to anyone immediately. Do you want to continue?": "Be careful when you're updating public sites. The changes you make are visible to anyone immediately. Do you want to continue?",
+  "Yes": "Yes",
+  "Current site path not found.": "Current site path not found.",
+  "Site Details": "Site Details",
+  "Browse...": "Browse...",
+  "Select the folder that will contain your project root for your site": "Select the folder that will contain your project root for your site",
+  "Select Folder": "Select Folder",
   "Timestamp: {0}/{0} is the timestamp": {
     "message": "Timestamp: {0}",
     "comment": [
@@ -253,6 +264,24 @@
       "{0} is the cluster geo name"
     ]
   },
+  "Friendly name: {0}/{0} is the website name": {
+    "message": "Friendly name: {0}",
+    "comment": [
+      "{0} is the website name"
+    ]
+  },
+  "Website ID: {0}/{0} is the website ID": {
+    "message": "Website ID: {0}",
+    "comment": [
+      "{0} is the website ID"
+    ]
+  },
+  "Data model version: v{0}/{0} is the data model version": {
+    "message": "Data model version: v{0}",
+    "comment": [
+      "{0} is the data model version"
+    ]
+  },
   "PAC Telemetry enabled": "PAC Telemetry enabled",
   "Failed to enable PAC telemetry.": "Failed to enable PAC telemetry.",
   "PAC Telemetry disabled": "PAC Telemetry disabled",
 
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
   <file original="bundle" source-language="en" datatype="plaintext"><body>
+    <trans-unit id="++CODE++08833dda22312dacb09f1d185caedf751289ee89a4c75682a09f4a262bf67ac4">
+      <source xml:lang="en"> End of Code Block </source>
+    </trans-unit>
     <trans-unit id="++CODE++29bb69945e50cb632fabf16f3f89a25d813910c19059d8a792f66262a952039d">
       <source xml:lang="en">@PowerPages is not yet available in your region.</source>
     </trans-unit>
@@ -60,6 +63,12 @@
     <trans-unit id="++CODE++bf27ec2e917b9f2578f8e6372f8656370d24cffe2c5a7b900d0b3280f8ec69fb">
       <source xml:lang="en">Be careful making changes. Anyone can see the changes you make immediately. Choose Edit the site to make edits, or close the editor tab to cancel without editing.</source>
     </trans-unit>
+    <trans-unit id="++CODE++6fab20ee9c8b4cb1fa10d787f3cd4eac13d34d27050fd193162a2399f690f59c">
+      <source xml:lang="en">Be careful when you're updating public sites. The changes you make are visible to anyone immediately. Do you want to continue?</source>
+    </trans-unit>
+    <trans-unit id="++CODE++c58a6bd402efb06c3e7dfd6d68910412fee2dfc1788ae384dc123089ce912285">
+      <source xml:lang="en">Browse...</source>
+    </trans-unit>
     <trans-unit id="++CODE++19766ed6ccb2f4a32778eed80d1928d2c87a18d7c275ccb163ec6709d3eb2e27">
       <source xml:lang="en">Cancel</source>
     </trans-unit>
@@ -114,6 +123,9 @@ The second line should be '[TRANSLATION HERE](https://aka.ms/pages-clear-cache).
       <source xml:lang="en">Cluster geo name: {0}</source>
       <note>{0} is the cluster geo name</note>
     </trans-unit>
+    <trans-unit id="++CODE++51e495f295ba55f724b77298746e3284ff9fc8e1e582828a9a3f4051fc577cb0">
+      <source xml:lang="en">Code Block </source>
+    </trans-unit>
     <trans-unit id="++CODE++eebdd24a77d9ad32222660c07777163bf5f6732df2b172351f3f8d5783e4f529">
       <source xml:lang="en">Confirm</source>
     </trans-unit>
@@ -123,6 +135,9 @@ The second line should be '[TRANSLATION HERE](https://aka.ms/pages-clear-cache).
     <trans-unit id="++CODE++916fa4a51e4d90e09a42289aa7961a6aff3401424f633240c630ac47f58a6d30">
       <source xml:lang="en">Copied to clipboard!</source>
     </trans-unit>
+    <trans-unit id="++CODE++9b44302f1c5e52f926415b952b83efce47fce76164fa64f1a42d1a1606efa11d">
+      <source xml:lang="en">Copilot Response</source>
+    </trans-unit>
     <trans-unit id="++CODE++b04e6767bf84555605710be1a94e48ddcbcb820353b859da427d189cf25395b4">
       <source xml:lang="en">Copilot illustration</source>
     </trans-unit>
@@ -136,6 +151,13 @@ The second line should be '[TRANSLATION HERE](https://aka.ms/pages-clear-cache).
     <trans-unit id="++CODE++e0d1b68224bf0b31ef16b206c65b5f8f6b89d18161f4a7cdcb8d0ac8d952549a">
       <source xml:lang="en">Current</source>
     </trans-unit>
+    <trans-unit id="++CODE++fc47ac56c8a4446c02d8470168a888d8e0040cfc0bb5ce6173e324dccc72f24c">
+      <source xml:lang="en">Current site path not found.</source>
+    </trans-unit>
+    <trans-unit id="++CODE++1da89bd5f5df020ca47c79dfdbc1517a299ca77570df2de4132f53797d5f2412">
+      <source xml:lang="en">Data model version: v{0}</source>
+      <note>{0} is the data model version</note>
+    </trans-unit>
     <trans-unit id="++CODE++5bd78fcb75f98d65ab8f89a8f0b6681c25c13308fa8643c44ab459b7783c06c9">
       <source xml:lang="en">Default Environment: {0}</source>
       <note>The {0} represents profile's resource/environment URL</note>
@@ -223,6 +245,10 @@ The {3} represents Solution's Type (Managed or Unmanaged), but that test is loca
     <trans-unit id="++CODE++1b93e507157d91755f08e1abfe8a33d725b637a32ddadf149420b25907d440a0">
       <source xml:lang="en">File(s) already exist. No new files to add</source>
     </trans-unit>
+    <trans-unit id="++CODE++56281cd1d0090cc4c7c38634a5738f51769927efda74805ba19e30e35868fd4e">
+      <source xml:lang="en">Friendly name: {0}</source>
+      <note>{0} is the website name</note>
+    </trans-unit>
     <trans-unit id="++CODE++7184a5edf42e6fc9ef8f53fc1dd73f10b3f6196a23f6d340c4f434e60c366e45">
       <source xml:lang="en">GETTING STARTED</source>
     </trans-unit>
@@ -450,6 +476,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
     <trans-unit id="++CODE++0134bc37f2fdeb11daa9e760ecee0ef9706989b33f77a38daadb8b7aae685749">
       <source xml:lang="en">Saving your file ...</source>
     </trans-unit>
+    <trans-unit id="++CODE++e597da9c984517f802536a83c825cd4f017898c5f28030fe1f62fb94f5228828">
+      <source xml:lang="en">Select Folder</source>
+    </trans-unit>
     <trans-unit id="++CODE++6e26632772595a9d2fdf17191f6d7b59983c308d884deed6ba317054f7d30688">
       <source xml:lang="en">Select Folder for new PCF Control</source>
       <note>Do not translate 'PCF' as it is a product name.</note>
@@ -460,6 +489,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
     <trans-unit id="++CODE++87468e6a845b82466220c11dd0ca315a4389dc1cb8e0ee102035bb4ce5cb7e39">
       <source xml:lang="en">Select an environment</source>
     </trans-unit>
+    <trans-unit id="++CODE++26297069e403c73e147151f2964757b7e9149762cf3a8e04ffd833907fb979e4">
+      <source xml:lang="en">Select the folder that will contain your project root for your site</source>
+    </trans-unit>
     <trans-unit id="++CODE++4d6f03fa73020c945e651c34d40c5529f3477ac02df254c1764a68d576575e14">
       <source xml:lang="en">Selection is empty.</source>
     </trans-unit>
@@ -472,6 +504,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
     <trans-unit id="++CODE++899fb203e6c2faac8093e21a2fa8db0d4b13d16ea5492461d8b72dbcee3ecf2a">
       <source xml:lang="en">Show Output Panel</source>
     </trans-unit>
+    <trans-unit id="++CODE++524bca0347e50e3801bebf27374124b3babf072729b4da4bcc45ef5c385ee8f4">
+      <source xml:lang="en">Site Details</source>
+    </trans-unit>
     <trans-unit id="++CODE++a72357d268bce5e1643bfd74563495784179f75ace0d652db8f808f293586b63">
       <source xml:lang="en">Site management URL not found for the selected site. Please try again after refreshing the environment.</source>
     </trans-unit>
@@ -557,6 +592,9 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
     <trans-unit id="++CODE++4b8d64fae5d1cbf5f7324782e9b5c430db7c218771e84b0b402a9a4d0ec4bf05">
       <source xml:lang="en">Unmanaged</source>
     </trans-unit>
+    <trans-unit id="++CODE++7fce0124a7cb74955461f08e39ceaaed1e2850492f077f4e6defd82ef3ca6b0e">
+      <source xml:lang="en">Upload changes</source>
+    </trans-unit>
     <trans-unit id="++CODE++696d5f7b79a75961bc5d99ecbbea7b535acc73160e0b6422daa45b0ae7c04368">
       <source xml:lang="en">User: {0}</source>
       <note>The {0} represents auth profile's user name (email address))</note>
@@ -573,6 +611,10 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
     <trans-unit id="++CODE++00dc171124ab430bbbaae51ec39dda1c5e7d045f382f56b1767d9e733292731c">
       <source xml:lang="en">Webpage names should contain only letters, numbers, hyphens, or underscores.</source>
     </trans-unit>
+    <trans-unit id="++CODE++091327257429303159b8580005b5b5a1e05fd028030817edaaa835cfcb0b3293">
+      <source xml:lang="en">Website ID: {0}</source>
+      <note>{0} is the website ID</note>
+    </trans-unit>
     <trans-unit id="++CODE++aa64cfbb63d3382bc0530c6e599467b1cc5c1ef8ff3b573d37ad628f9058b2aa">
       <source xml:lang="en">Website not found in the environment. Please check the credentials and login with correct account.</source>
     </trans-unit>
@@ -594,12 +636,18 @@ The {3} represents Dataverse Environment's Organization ID (GUID)</note>
     <trans-unit id="++CODE++9265d4c9f6b10b1a95877bcccee77e9d164e8a51ab17104b14ba19e7935aef0e">
       <source xml:lang="en">Write web API code to query active contact records.</source>
     </trans-unit>
+    <trans-unit id="++CODE++85a39ab345d672ff8ca9b9c6876f3adcacf45ee7c1e2dbd2408fd338bd55e07e">
+      <source xml:lang="en">Yes</source>
+    </trans-unit>
     <trans-unit id="++CODE++3c65297a1fc0860c6993f5c8beb4341dd13b71d7f3957daba611adf04a6c971b">
       <source xml:lang="en">You are editing a live, public site </source>
     </trans-unit>
     <trans-unit id="++CODE++beb45bfdd4c3f6da9bb3687e4d9275790d086c1dffaec84839fa9ec9ce4e9ee2">
       <source xml:lang="en">You can use this in &lt;a href=&quot;#&quot; id=&quot;github-copilot-link&quot;&gt;GitHub Copilot with @powerpages&lt;/a&gt; and leverage best of both world.</source>
     </trans-unit>
+    <trans-unit id="++CODE++eeb25aaca6a9e3f6c670334480b8e56e2a362ecfec23f8e63617915b22ddc8a0">
+      <source xml:lang="en">Your preview isn't updated. Please upload your site to see the latest changes.</source>
+    </trans-unit>
     <trans-unit id="++CODE++3a928d0a6dd0e0c6b56eb3bf08b20e6361e876fd6b2eeca59f718cbfdc310472">
       <source xml:lang="en">dotnet sdk 6.0 or greater must be installed</source>
       <note>Do not translate 'dotnet' or 'sdk'</note>
@@ -674,6 +722,9 @@ The fifth line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.s
     <trans-unit id="pacCLI.openDocumentation.title">
       <source xml:lang="en">Documentation</source>
     </trans-unit>
+    <trans-unit id="microsoft.powerplatform.pages.actionsHub.activeSite.downloadSite.title">
+      <source xml:lang="en">Download Site</source>
+    </trans-unit>
     <trans-unit id="microsoft-powerapps-portals.walkthrough.title">
       <source xml:lang="en">Edit Power Pages code</source>
     </trans-unit>
@@ -702,7 +753,7 @@ The eighth line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.
       <source xml:lang="en">Initialize Web Extension</source>
     </trans-unit>
     <trans-unit id="microsoft.powerplatform.pages.actionsHub.login">
-      <source xml:lang="en">Login and connect to a Power Pages environment to use Power Pages actions. [Learn more](https://example.com/learn-more).
+      <source xml:lang="en">Login and connect to a Power Pages environment to use Power Pages actions. [Learn more](https://go.microsoft.com/fwlink/?linkid=2305702).
 [Login](command:microsoft.powerplatform.pages.actionsHub.newAuthProfile)</source>
       <note>This is a Markdown formatted string, and the formatting must persist across translations.
 The second line should be '[TRANSLATION HERE](command:microsoft.powerplatform.pages.actionsHub.newAuthProfile).', keeping brackets and the text in the parentheses unmodified</note>
@@ -743,6 +794,9 @@ The second line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.
     <trans-unit id="pacCLI.openPacLab.title">
       <source xml:lang="en">Open PAC Lab</source>
     </trans-unit>
+    <trans-unit id="microsoft.powerplatform.pages.actionsHub.activeSite.openInStudio.title">
+      <source xml:lang="en">Open in Power Pages Studio</source>
+    </trans-unit>
     <trans-unit id="microsoft.powerplatform.pages.actionsHub.openSitesInStudio.title">
       <source xml:lang="en">Open in Power Pages Studio</source>
     </trans-unit>
@@ -816,6 +870,12 @@ The second line should be '[TRANSLATION HERE](command:powerplatform-walkthrough.
     <trans-unit id="pacCLI.pacSolutionHelp.title">
       <source xml:lang="en">Show PAC Solution Help</source>
     </trans-unit>
+    <trans-unit id="microsoft.powerplatform.pages.actionsHub.siteDetails.title">
+      <source xml:lang="en">Site Details</source>
+    </trans-unit>
+    <trans-unit id="microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite.title">
+      <source xml:lang="en">Upload Site</source>
+    </trans-unit>
     <trans-unit id="microsoft-powerapps-portals.walkthrough.advancedCapabilities.description">
       <source xml:lang="en">Visual Studio Code for Web enables editing and publishing of web pages on your website.
 
 
@@ -167,7 +167,7 @@
         "when": "!virtualWorkspace && !pacCLI.authPanel.interactiveLoginSupported"
       },
       {
-        "view":"microsoft.powerplatform.pages.actionsHub",
+        "view": "microsoft.powerplatform.pages.actionsHub",
         "contents": "%microsoft.powerplatform.pages.actionsHub.login%",
         "when": "!virtualWorkspace && pacCLI.authPanel.interactiveLoginSupported"
       }
@@ -435,6 +435,22 @@
       {
         "command": "microsoft.powerplatform.pages.actionsHub.inactiveSite.openSiteManagement",
         "title": "%microsoft.powerplatform.pages.actionsHub.inactiveSite.openSiteManagement.title%"
+      },
+      {
+        "command": "microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite",
+        "title": "%microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite.title%"
+      },
+      {
+        "command": "microsoft.powerplatform.pages.actionsHub.siteDetails",
+        "title": "%microsoft.powerplatform.pages.actionsHub.siteDetails.title%"
+      },
+      {
+        "command": "microsoft.powerplatform.pages.actionsHub.activeSite.downloadSite",
+        "title": "%microsoft.powerplatform.pages.actionsHub.activeSite.downloadSite.title%"
+      },
+      {
+        "command": "microsoft.powerplatform.pages.actionsHub.activeSite.openInStudio",
+        "title": "%microsoft.powerplatform.pages.actionsHub.activeSite.openInStudio.title%"
       }
     ],
     "configuration": {
@@ -915,6 +931,22 @@
         {
           "command": "microsoft.powerplatform.pages.actionsHub.inactiveSite.openSiteManagement",
           "when": "never"
+        },
+        {
+          "command": "microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite",
+          "when": "never"
+        },
+        {
+          "command": "microsoft.powerplatform.pages.actionsHub.siteDetails",
+          "when": "never"
+        },
+        {
+          "command": "microsoft.powerplatform.pages.actionsHub.activeSite.downloadSite",
+          "when": "never"
+        },
+        {
+          "command": "microsoft.powerplatform.pages.actionsHub.activeSite.openInStudio",
+          "when": "never"
         }
       ],
       "view/title": [
@@ -1041,27 +1073,47 @@
         {
           "command": "microsoft.powerplatform.pages.actionsHub.activeSite.preview",
           "when": "view == microsoft.powerplatform.pages.actionsHub && (viewItem == currentActiveSite || viewItem == nonCurrentActiveSite)",
-          "group": "activeSiteContextMenuGroup@1"
+          "group": "siteAction@1"
+        },
+        {
+          "command": "microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite",
+          "when": "view == microsoft.powerplatform.pages.actionsHub && (viewItem == currentActiveSite || viewItem == otherSite)",
+          "group": "siteAction@2"
+        },
+        {
+          "command": "microsoft.powerplatform.pages.actionsHub.activeSite.downloadSite",
+          "when": "view == microsoft.powerplatform.pages.actionsHub && (viewItem == currentActiveSite || viewItem == nonCurrentActiveSite)",
+          "group": "siteAction@3"
+        },
+        {
+          "command": "microsoft.powerplatform.pages.actionsHub.siteDetails",
+          "when": "view == microsoft.powerplatform.pages.actionsHub && (viewItem == currentActiveSite || viewItem == nonCurrentActiveSite || viewItem == inactiveSite)",
+          "group": "siteAction@4"
         },
         {
           "command": "microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.windows",
-          "when": "view == microsoft.powerplatform.pages.actionsHub && viewItem == currentActiveSite && isWindows",
-          "group": "activeSiteContextMenuGroup@2"
+          "when": "view == microsoft.powerplatform.pages.actionsHub && (viewItem == currentActiveSite || viewItem == otherSite) && isWindows",
+          "group": "siteAction@5"
         },
         {
           "command": "microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.mac",
-          "when": "view == microsoft.powerplatform.pages.actionsHub && viewItem == currentActiveSite && isMac",
-          "group": "activeSiteContextMenuGroup@2"
+          "when": "view == microsoft.powerplatform.pages.actionsHub && (viewItem == currentActiveSite || viewItem == otherSite) && isMac",
+          "group": "siteAction@5"
         },
         {
           "command": "microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.linux",
-          "when": "view == microsoft.powerplatform.pages.actionsHub && viewItem == currentActiveSite && isLinux",
-          "group": "activeSiteContextMenuGroup@2"
+          "when": "view == microsoft.powerplatform.pages.actionsHub && (viewItem == currentActiveSite || viewItem == otherSite) && isLinux",
+          "group": "siteAction@5"
         },
         {
           "command": "microsoft.powerplatform.pages.actionsHub.inactiveSite.openSiteManagement",
           "when": "view == microsoft.powerplatform.pages.actionsHub && viewItem == inactiveSite",
-          "group": "inactiveSiteContextMenuGroup@1"
+          "group": "siteAction@3"
+        },
+        {
+          "command": "microsoft.powerplatform.pages.actionsHub.activeSite.openInStudio",
+          "when": "view == microsoft.powerplatform.pages.actionsHub && (viewItem == currentActiveSite || viewItem == nonCurrentActiveSite)",
+          "group": "siteAction@6"
         }
       ]
     },
@@ -1283,7 +1335,7 @@
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.1",
     "worker-loader": "^3.0.8",
-    "yaml": "^2.2.2"
+    "yaml": "^2.7.0"
   },
   "__metadata": {
     "id": "b8680bb6-eaa9-481a-ae0b-83574fa58620",
 
@@ -99,7 +99,7 @@
   "microsoft.powerplatform.pages.actionsHub.openSitesInStudio.title": "Open in Power Pages Studio",
   "microsoft.powerplatform.pages.actionsHub.activeSite.previewSite.title": "Preview",
   "microsoft.powerplatform.pages.actionsHub.login":{
-    "message":  "Login and connect to a Power Pages environment to use Power Pages actions. [Learn more](https://example.com/learn-more).\n[Login](command:microsoft.powerplatform.pages.actionsHub.newAuthProfile)",
+    "message":  "Login and connect to a Power Pages environment to use Power Pages actions. [Learn more](https://go.microsoft.com/fwlink/?linkid=2305702).\n[Login](command:microsoft.powerplatform.pages.actionsHub.newAuthProfile)",
     "comment": [
       "This is a Markdown formatted string, and the formatting must persist across translations.",
       "The second line should be '[TRANSLATION HERE](command:microsoft.powerplatform.pages.actionsHub.newAuthProfile).', keeping brackets and the text in the parentheses unmodified"
@@ -109,5 +109,9 @@
   "microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.windows.title": "Reveal in Explorer",
   "microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.mac.title": "Reveal in Finder",
   "microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.linux.title": "Open Containing Folder",
-  "microsoft.powerplatform.pages.actionsHub.inactiveSite.openSiteManagement.title": "Open site management"
+  "microsoft.powerplatform.pages.actionsHub.inactiveSite.openSiteManagement.title": "Open site management",
+  "microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite.title": "Upload Site",
+  "microsoft.powerplatform.pages.actionsHub.siteDetails.title": "Site Details",
+  "microsoft.powerplatform.pages.actionsHub.activeSite.downloadSite.title": "Download Site",
+  "microsoft.powerplatform.pages.actionsHub.activeSite.openInStudio.title": "Open in Power Pages Studio"
 }
@@ -0,0 +1,13 @@
+{
+  "headers": [
+    {
+      "source": "**/*",
+      "headers": [
+        {
+          "key": "Cross-Origin-Resource-Policy",
+          "value": "cross-origin"
+        }
+      ]
+    }
+  ]
+}
@@ -163,6 +163,9 @@ export async function activate(
 
     const workspaceFolders = getWorkspaceFolders();
 
+    // Init OrgChangeNotifier instance
+    OrgChangeNotifier.createOrgChangeNotifierInstance(pacTerminal.getWrapper());
+
     _context.subscriptions.push(
         orgChangeEvent(async (orgDetails: ActiveOrgOutput) => {
             const orgID = orgDetails.OrgId;
@@ -211,7 +214,7 @@ export async function activate(
                 oneDSLoggerWrapper.getLogger().traceInfo(desktopTelemetryEventNames.DESKTOP_EXTENSION_INIT_CONTEXT, initContext);
             }
 
-            if (!copilotNotificationShown) {
+            if (!copilotNotificationShown && workspaceContainsPortalConfigFolder(workspaceFolders)) {
                 let telemetryData = '';
                 let listOfActivePortals = [];
                 try {
@@ -230,7 +233,7 @@ export async function activate(
             }
 
             await Promise.allSettled([
-                PreviewSite.initialize(context, workspaceFolders),
+                PreviewSite.initialize(context, workspaceFolders, pacTerminal),
                 ActionsHub.initialize(context, pacTerminal)
             ]);
         }),
@@ -243,9 +246,6 @@ export async function activate(
 
     if (workspaceContainsPortalConfigFolder(workspaceFolders)) {
 
-        // Init OrgChangeNotifier instance
-        OrgChangeNotifier.createOrgChangeNotifierInstance(pacTerminal.getWrapper());
-
         vscode.workspace.onDidOpenTextDocument(didOpenTextDocument);
         vscode.workspace.textDocuments.forEach(didOpenTextDocument);
 
 
@@ -76,7 +76,7 @@ export class PacTerminal implements vscode.Disposable {
         vscode.env.openExternal(vscode.Uri.parse('https://aka.ms/powerplatform-vscode-lab'));
     }
 
-    private static getTerminal(): vscode.Terminal {
+    public static getTerminal(): vscode.Terminal {
         const terminal = vscode.window.activeTerminal ?
             vscode.window.activeTerminal as vscode.Terminal :
             vscode.window.createTerminal();
 
@@ -164,7 +164,7 @@ export class PacWrapper {
         return this.executeCommandAndParseResults<PacOrgWhoOutput>(new PacArguments("org", "who"));
     }
 
-    public async activeAuth(): Promise <PacAuthWhoOutput> {
+    public async activeAuth(): Promise<PacAuthWhoOutput> {
         return this.executeCommandAndParseResults<PacAuthWhoOutput>(new PacArguments("auth", "who"));
     }
 
@@ -180,6 +180,10 @@ export class PacWrapper {
         return this.executeCommandAndParseResults<PacOutput>(new PacArguments("telemetry", "disable"));
     }
 
+    public async pendingChanges(websitePath: string, dataModelVersion: 1 | 2): Promise<PacOutput> {
+        return this.executeCommandAndParseResults<PacOutput>(new PacArguments("pages", "pending-changes", "-p", websitePath, "-mv", dataModelVersion.toString()));
+    }
+
     public exit(): void {
         this.pacInterop.exit();
     }
 
@@ -11,10 +11,10 @@ import { oneDSLoggerWrapper } from "../../../common/OneDSLoggerTelemetry/oneDSLo
 import { EnvironmentGroupTreeItem } from "./tree-items/EnvironmentGroupTreeItem";
 import { IEnvironmentInfo } from "./models/IEnvironmentInfo";
 import { PacTerminal } from "../../lib/PacTerminal";
-import { fetchWebsites, openActiveSitesInStudio, openInactiveSitesInStudio, previewSite, createNewAuthProfile, refreshEnvironment, showEnvironmentDetails, switchEnvironment, revealInOS, openSiteManagement } from "./ActionsHubCommandHandlers";
+import { fetchWebsites, openActiveSitesInStudio, openInactiveSitesInStudio, previewSite, createNewAuthProfile, refreshEnvironment, showEnvironmentDetails, switchEnvironment, revealInOS, openSiteManagement, uploadSite, showSiteDetails, downloadSite, openInStudio } from "./ActionsHubCommandHandlers";
 import PacContext from "../../pac/PacContext";
 import CurrentSiteContext from "./CurrentSiteContext";
-import { IWebsiteDetails } from "../../../common/services/Interfaces";
+import { IOtherSiteInfo, IWebsiteDetails } from "../../../common/services/Interfaces";
 import { orgChangeErrorEvent } from "../../OrgChangeNotifier";
 
 export class ActionsHubTreeDataProvider implements vscode.TreeDataProvider<ActionsHubTreeItem> {
@@ -25,6 +25,7 @@ export class ActionsHubTreeDataProvider implements vscode.TreeDataProvider<Actio
 
     private _activeSites: IWebsiteDetails[] = [];
     private _inactiveSites: IWebsiteDetails[] = [];
+    private _otherSites: IOtherSiteInfo[] = [];
     private _loadWebsites = true;
 
     private constructor(context: vscode.ExtensionContext, private readonly _pacTerminal: PacTerminal) {
@@ -53,6 +54,7 @@ export class ActionsHubTreeDataProvider implements vscode.TreeDataProvider<Actio
             const websites = await fetchWebsites();
             this._activeSites = websites.activeSites;
             this._inactiveSites = websites.inactiveSites;
+            this._otherSites = websites.otherSites;
             this._loadWebsites = false;
         }
     }
@@ -78,9 +80,13 @@ export class ActionsHubTreeDataProvider implements vscode.TreeDataProvider<Actio
                 const currentEnvInfo: IEnvironmentInfo = {
                     currentEnvironmentName: authInfo.OrganizationFriendlyName
                 };
+
+                if(!this._otherSites.length){
+                    return [new EnvironmentGroupTreeItem(currentEnvInfo, this._context, this._activeSites, this._inactiveSites)];
+                }
                 return [
                     new EnvironmentGroupTreeItem(currentEnvInfo, this._context, this._activeSites, this._inactiveSites),
-                    new OtherSitesGroupTreeItem()
+                    new OtherSitesGroupTreeItem(this._otherSites)
                 ];
             } else {
                 // Login experience scenario
@@ -120,7 +126,15 @@ export class ActionsHubTreeDataProvider implements vscode.TreeDataProvider<Actio
             vscode.commands.registerCommand("microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.mac", revealInOS),
             vscode.commands.registerCommand("microsoft.powerplatform.pages.actionsHub.currentActiveSite.revealInOS.linux", revealInOS),
 
-            vscode.commands.registerCommand("microsoft.powerplatform.pages.actionsHub.inactiveSite.openSiteManagement", openSiteManagement)
+            vscode.commands.registerCommand("microsoft.powerplatform.pages.actionsHub.inactiveSite.openSiteManagement", openSiteManagement),
+
+            vscode.commands.registerCommand("microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite", uploadSite),
+
+            vscode.commands.registerCommand("microsoft.powerplatform.pages.actionsHub.siteDetails", showSiteDetails),
+
+            vscode.commands.registerCommand("microsoft.powerplatform.pages.actionsHub.activeSite.downloadSite", downloadSite),
+
+            vscode.commands.registerCommand("microsoft.powerplatform.pages.actionsHub.activeSite.openInStudio", openInStudio)
         ];
     }
 }
@@ -15,7 +15,7 @@ export const Constants = {
         INACTIVE_SITE: "inactiveSite",
         OTHER_SITE: "otherSite",
         OTHER_SITES_GROUP: "otherSitesGroup",
-        NO_SITES: "noSites"
+        NO_SITES: "noSites",
     },
     Icons: {
         SITE: new vscode.ThemeIcon('globe'),
@@ -33,7 +33,14 @@ export const Constants = {
         SESSION_DETAILS: vscode.l10n.t("Session Details"),
         CHANGING_ENVIRONMENT: vscode.l10n.t("Changing environment..."),
         CURRENT: vscode.l10n.t("Current"),
-        SITE_MANAGEMENT_URL_NOT_FOUND: vscode.l10n.t("Site management URL not found for the selected site. Please try again after refreshing the environment.")
+        SITE_MANAGEMENT_URL_NOT_FOUND: vscode.l10n.t("Site management URL not found for the selected site. Please try again after refreshing the environment."),
+        SITE_UPLOAD_CONFIRMATION: vscode.l10n.t(`Be careful when you're updating public sites. The changes you make are visible to anyone immediately. Do you want to continue?`),
+        YES: vscode.l10n.t("Yes"),
+        CURRENT_SITE_PATH_NOT_FOUND: vscode.l10n.t("Current site path not found."),
+        SITE_DETAILS: vscode.l10n.t("Site Details"),
+        BROWSE: vscode.l10n.t("Browse..."),
+        SELECT_DOWNLOAD_FOLDER: vscode.l10n.t("Select the folder that will contain your project root for your site"),
+        SELECT_FOLDER: vscode.l10n.t("Select Folder")
     },
     EventNames: {
         ACTIONS_HUB_INITIALIZED: "actionsHubInitialized",
@@ -44,7 +51,13 @@ export const Constants = {
         ORGANIZATION_URL_MISSING: "Organization URL is missing in the results.",
         EMPTY_RESULTS_ARRAY: "Results array is empty or not an array.",
         PAC_AUTH_OUTPUT_FAILURE: "pacAuthCreateOutput is missing or unsuccessful.",
-        SITE_MANAGEMENT_URL_NOT_FOUND: "siteManagementUrlNotFound"
+        SITE_MANAGEMENT_URL_NOT_FOUND: "siteManagementUrlNotFound",
+        ACTIONS_HUB_UPLOAD_SITE: "actionsHubUploadSite",
+        ACTIONS_HUB_UPLOAD_SITE_CANCELLED: "actionsHubUploadSiteCancelled",
+        OTHER_SITES_YAML_PARSE_FAILED: "OtherSitesYamlParseFailed",
+        OTHER_SITES_FILESYSTEM_ERROR: "OtherSitesFilesystemError",
+        ACTIONS_HUB_UPLOAD_OTHER_SITE: "ActionsHubUploadOtherSite",
+        ACTIONS_HUB_UPLOAD_SITE_FAILED: "ActionsHubUploadSiteFailed",
     },
     StudioEndpoints: {
         TEST: "https://make.test.powerpages.microsoft.com",
@@ -55,6 +68,10 @@ export const Constants = {
         HIGH: "https://make.high.powerpages.microsoft.us",
         MOONCAKE: "https://make.powerpages.microsoft.cn"
     },
+    SiteVisibility : {
+        PUBLIC: "public",
+        PRIVATE: "private"
+    },
     AppNames: {
         POWER_PAGES_MANAGEMENT: 'mspp_powerpagemanagement',
         PORTAL_MANAGEMENT: 'dynamics365portals'
 
@@ -14,4 +14,5 @@ export interface IWebsiteInfo {
     isCurrent: boolean;
     siteVisibility: string;
     siteManagementUrl: string;
+    folderPath?: string;    
 }
@@ -7,15 +7,15 @@ import * as vscode from "vscode";
 
 export abstract class ActionsHubTreeItem extends vscode.TreeItem {
     constructor(
-        public readonly label: string,
+        label: string | null | undefined,
         public readonly collapsibleState: vscode.TreeItemCollapsibleState,
         public readonly iconPath: string | vscode.Uri | { light: string | vscode.Uri; dark: string | vscode.Uri } | vscode.ThemeIcon,
         public readonly contextValue: string,
         public readonly description: string = "",
     ) {
-        super(label, collapsibleState);
+        super(label || "", collapsibleState);
 
-        this.tooltip = this.label;
+        this.tooltip = label || "";
     }
 
     public getChildren(): ActionsHubTreeItem[] {
 
@@ -39,12 +39,20 @@ export class ActiveGroupTreeItem extends ActionsHubTreeItem {
                 dataModelVersion: site.dataModel == WebsiteDataModel.Standard ? 1 : 2,
                 websiteUrl: site.websiteUrl,
                 status: WebsiteStatus.Active,
-                isCurrent: CurrentSiteContext.currentSiteId === site.websiteRecordId,
+                isCurrent: this.isCurrentSite(site.websiteRecordId),
                 siteVisibility: site.siteVisibility ?? "",
                 siteManagementUrl: site.siteManagementUrl
             };
 
             return new SiteTreeItem(siteInfo);
         });
     }
+
+    private isCurrentSite(siteId: string): boolean {
+        if (!CurrentSiteContext.currentSiteId || !siteId) {
+            return false;
+        }
+
+        return CurrentSiteContext.currentSiteId === siteId;
+    }
 }
@@ -6,14 +6,39 @@
 import * as vscode from "vscode";
 import { Constants } from "../Constants"
 import { ActionsHubTreeItem } from "./ActionsHubTreeItem"
+import { IOtherSiteInfo } from "../../../../common/services/Interfaces";
+import { IWebsiteInfo } from "../models/IWebsiteInfo";
+import { SiteTreeItem } from "./SiteTreeItem";
 
 export class OtherSitesGroupTreeItem extends ActionsHubTreeItem {
-    constructor() {
+    private _otherSites: IOtherSiteInfo[] = [];
+
+
+    constructor(otherSites: IOtherSiteInfo[]) {
         super(
             Constants.Strings.OTHER_SITES,
             vscode.TreeItemCollapsibleState.Collapsed,
             Constants.Icons.OTHER_SITES,
             Constants.ContextValues.OTHER_SITES_GROUP
-        )
+        );
+        this._otherSites = otherSites;
+    }
+
+    public getChildren(): ActionsHubTreeItem[] {
+        return this._otherSites.map(site => {
+            const siteInfo: IWebsiteInfo = {
+                name: site.name,
+                websiteId: site.websiteId || '',
+                dataModelVersion: 2, // For other sites, we don't have this information. Defaulting to 2 and will rely on current sites to determine the data model for operations.
+                status: undefined,
+                isCurrent: false,
+                websiteUrl: "",
+                siteVisibility: "",
+                siteManagementUrl: "",
+                folderPath : site.folderPath
+            };
+            return new SiteTreeItem(siteInfo);
+        });
+
     }
 }
@@ -11,7 +11,6 @@ export const Messages = {
     INSTALL: vscode.l10n.t("Install"),
     EDGE_DEV_TOOLS_NOT_INSTALLED_MESSAGE: vscode.l10n.t({ message: "The extension 'Microsoft Edge Tools' is required to run this command. Do you want to install it now?", comment: ["Do not translate 'Microsoft Edge Tools' "] }),
     OPENING_SITE_PREVIEW: vscode.l10n.t("Opening site preview..."),
-    PREVIEW_SHOWN_FOR_PUBLISHED_CHANGES: vscode.l10n.t("The preview shown is for published changes."),
     SITE_PREVIEW_FEATURE_NOT_ENABLED: vscode.l10n.t("Site runtime preview feature is not enabled."),
     NO_FOLDER_OPENED: vscode.l10n.t("No workspace folder opened. Please open a site folder to preview."),
     INITIALIZING_PREVIEW_TRY_AGAIN: vscode.l10n.t("Initializing site preview. Please try again after few seconds."),
@@ -31,9 +30,12 @@ export const Messages = {
     }),
     AUTHENTICATING: vscode.l10n.t("Authenticating..."),
     UNABLE_TO_CLEAR_CACHE: vscode.l10n.t("Unable to clear cache"),
+    PREVIEW_WARNING: vscode.l10n.t("Your preview isn't updated. Please upload your site to see the latest changes."),
+    UPLOAD_CHANGES: vscode.l10n.t("Upload changes")
 };
 
 export const Events = {
     PREVIEW_SITE_INITIALIZED: "PreviewSiteInitialized",
-    PREVIEW_SITE_INITIALIZATION_FAILED: "PreviewSiteInitializationFailed"
+    PREVIEW_SITE_INITIALIZATION_FAILED: "PreviewSiteInitializationFailed",
+    PREVIEW_SITE_UPLOAD_WARNING_FAILED: "PreviewSiteUploadWarningFailed"
 }
@@ -8,22 +8,28 @@ import { ECSFeaturesClient } from '../../../common/ecs-features/ecsFeatureClient
 import { EnableSiteRuntimePreview } from '../../../common/ecs-features/ecsFeatureGates';
 import { WorkspaceFolder } from 'vscode-languageclient/node';
 import { getWebsiteRecordId } from '../../../common/utilities/WorkspaceInfoFinderUtil';
-import { PROVIDER_ID } from '../../../common/services/Constants';
+import { PROVIDER_ID, WebsiteDataModel } from '../../../common/services/Constants';
 import { PPAPIService } from '../../../common/services/PPAPIService';
 import { VSCODE_EXTENSION_GET_WEBSITE_RECORD_ID_EMPTY, VSCODE_EXTENSION_SITE_PREVIEW_ERROR } from '../../../common/services/TelemetryConstants';
-import { EDGE_TOOLS_EXTENSION_ID } from '../../../common/constants';
+import { EDGE_TOOLS_EXTENSION_ID, SUCCESS, TRUE } from '../../../common/constants';
 import { oneDSLoggerWrapper } from "../../../common/OneDSLoggerTelemetry/oneDSLoggerWrapper";
 import { getWorkspaceFolders, showProgressWithNotification } from '../../../common/utilities/Utils';
 import { Events, Messages } from './Constants';
 import { dataverseAuthentication } from '../../../common/services/AuthenticationProvider';
 import PacContext from '../../pac/PacContext';
 import ArtemisContext from '../../ArtemisContext';
+import { PacTerminal } from '../../lib/PacTerminal';
+import CurrentSiteContext from '../actions-hub/CurrentSiteContext';
+import { IWebsiteDetails } from '../../../common/services/Interfaces';
+import { uploadSite } from '../actions-hub/ActionsHubCommandHandlers';
+import { SiteTreeItem } from '../actions-hub/tree-items/SiteTreeItem';
 
 export const SITE_PREVIEW_COMMAND_ID = "microsoft.powerplatform.pages.preview-site";
 
 export class PreviewSite {
-    private static _websiteUrl: string | undefined = undefined;
+    private static _websiteDetails: IWebsiteDetails | undefined = undefined;
     private static _isInitialized = false;
+    private static _pacTerminal: PacTerminal;
 
 
     static isSiteRuntimePreviewEnabled(): boolean {
@@ -36,11 +42,13 @@ export class PreviewSite {
         return enableSiteRuntimePreview;
     }
 
-    static async initialize(context: vscode.ExtensionContext, workspaceFolders: WorkspaceFolder[]): Promise<void> {
+    static async initialize(context: vscode.ExtensionContext, workspaceFolders: WorkspaceFolder[], pacTerminal: PacTerminal): Promise<void> {
         if (PreviewSite._isInitialized) {
             return;
         }
 
+        PreviewSite._pacTerminal = pacTerminal;
+
         try {
             const isSiteRuntimePreviewEnabled = PreviewSite.isSiteRuntimePreviewEnabled();
 
@@ -52,16 +60,16 @@ export class PreviewSite {
             const orgDetails = PacContext.OrgInfo;
 
             if (artemisResponse && orgDetails && isSiteRuntimePreviewEnabled) {
-                PacContext.onChanged(async () => await PreviewSite.loadSiteUrl(workspaceFolders));
+                PacContext.onChanged(async () => await PreviewSite.loadSiteDetails(workspaceFolders));
 
                 context.subscriptions.push(
                     vscode.commands.registerCommand(
                         SITE_PREVIEW_COMMAND_ID,
-                        async () => await PreviewSite.handlePreviewRequest()
+                        PreviewSite.handlePreviewRequest
                     )
                 );
 
-                await PreviewSite.loadSiteUrl(workspaceFolders);
+                await PreviewSite.loadSiteDetails(workspaceFolders);
                 await vscode.commands.executeCommand("setContext", "microsoft.powerplatform.pages.siteRuntimePreviewEnabled", true);
             }
 
@@ -72,29 +80,29 @@ export class PreviewSite {
         }
     }
 
-    static async loadSiteUrl(workspaceFolders: WorkspaceFolder[]): Promise<void> {
-        const websiteUrl = await PreviewSite.getWebSiteUrl(workspaceFolders);
+    static async loadSiteDetails(workspaceFolders: WorkspaceFolder[]): Promise<void> {
+        const websiteDetails = await PreviewSite.getWebsiteDetails(workspaceFolders);
 
-        this._websiteUrl = websiteUrl;
+        PreviewSite._websiteDetails = websiteDetails;
     }
 
-    private static async getWebSiteUrl(workspaceFolders: WorkspaceFolder[]): Promise<string> {
+    private static async getWebsiteDetails(workspaceFolders: WorkspaceFolder[]): Promise<IWebsiteDetails> {
         const websiteRecordId = getWebsiteRecordId(workspaceFolders);
         if (!websiteRecordId) {
             oneDSLoggerWrapper.getLogger().traceInfo(VSCODE_EXTENSION_GET_WEBSITE_RECORD_ID_EMPTY, {
                 websiteRecordId: websiteRecordId
             });
-            return "";
+            return {} as IWebsiteDetails;
         }
 
         const orgDetails = PacContext.OrgInfo;
 
         if (!orgDetails) {
-            return "";
+            return {} as IWebsiteDetails;
         }
 
         const websiteDetails = await PPAPIService.getWebsiteDetailsByWebsiteRecordId(ArtemisContext.ServiceResponse.stamp, orgDetails.EnvironmentId, websiteRecordId);
-        return websiteDetails?.websiteUrl || "";
+        return websiteDetails ?? {} as IWebsiteDetails;
     }
 
     private static async promptInstallEdgeTools(): Promise<void> {
@@ -108,15 +116,15 @@ export class PreviewSite {
         }
     }
 
-    public static async launchBrowserAndDevToolsWithinVsCode(webSitePreviewURL: string | undefined): Promise<void> {
+    public static async launchBrowserAndDevToolsWithinVsCode(webSitePreviewURL: string | undefined, dataModelVersion: 1 | 2, siteVisibility: string): Promise<void> {
         if (!webSitePreviewURL || webSitePreviewURL === "") {
             return;
         }
 
         const edgeToolsExtension = vscode.extensions.getExtension(EDGE_TOOLS_EXTENSION_ID);
 
         if (!edgeToolsExtension) {
-            await this.promptInstallEdgeTools();
+            await PreviewSite.promptInstallEdgeTools();
             return;
         }
 
@@ -125,7 +133,31 @@ export class PreviewSite {
             async () => await vscode.commands.executeCommand('vscode-edge-devtools.launch', { launchUrl: webSitePreviewURL })
         );
 
-        await vscode.window.showInformationMessage(Messages.PREVIEW_SHOWN_FOR_PUBLISHED_CHANGES);
+        const websitePath = CurrentSiteContext.currentSiteFolderPath;
+        if (websitePath) {
+            await PreviewSite.showUploadWarning(websitePath, dataModelVersion, siteVisibility);
+        }
+    }
+
+    private static async showUploadWarning(websitePath: string, dataModelVersion: 1 | 2, siteVisibility: string) {
+        const pendingChangesResult = await PreviewSite._pacTerminal.getWrapper().pendingChanges(websitePath, dataModelVersion);
+
+        try {
+            if (pendingChangesResult.Status === SUCCESS && pendingChangesResult.Information[pendingChangesResult.Information.length - 1].includes(TRUE)) {
+                const result = await vscode.window.showInformationMessage(Messages.PREVIEW_WARNING, Messages.UPLOAD_CHANGES, Messages.CANCEL);
+                if (result === Messages.UPLOAD_CHANGES) {
+                    await uploadSite({
+                        siteInfo: {
+                            dataModelVersion: dataModelVersion,
+                            siteVisibility: siteVisibility
+                        }
+                    } as SiteTreeItem, websitePath);
+                }
+            }
+        } catch (exception) {
+            const exceptionError = exception as Error;
+            oneDSLoggerWrapper.getLogger().traceError(Events.PREVIEW_SITE_UPLOAD_WARNING_FAILED, exceptionError.message, exceptionError);
+        }
     }
 
     static async handlePreviewRequest() {
@@ -146,7 +178,7 @@ export class PreviewSite {
             return;
         }
 
-        if (this._websiteUrl === undefined) {
+        if (PreviewSite._websiteDetails === undefined) {
             oneDSLoggerWrapper.getLogger().traceInfo(VSCODE_EXTENSION_SITE_PREVIEW_ERROR, { error: Messages.INITIALIZING_PREVIEW_TRY_AGAIN });
             await vscode.window.showWarningMessage(Messages.INITIALIZING_PREVIEW_TRY_AGAIN);
             return;
@@ -160,17 +192,22 @@ export class PreviewSite {
             return;
         }
 
-        if (this._websiteUrl === "") {
+        if (!PreviewSite._websiteDetails.websiteUrl) {
             let shouldRepeatLoginFlow = true;
 
             while (shouldRepeatLoginFlow) {
                 shouldRepeatLoginFlow = await PreviewSite.handleEmptyWebsiteUrl();
             }
         }
 
-        await PreviewSite.clearCache(this._websiteUrl);
 
-        await PreviewSite.launchBrowserAndDevToolsWithinVsCode(this._websiteUrl);
+        await PreviewSite.clearCache(PreviewSite._websiteDetails.websiteUrl);
+
+        await PreviewSite.launchBrowserAndDevToolsWithinVsCode(
+            PreviewSite._websiteDetails.websiteUrl,
+            PreviewSite._websiteDetails.dataModel === WebsiteDataModel.Standard ? 1 : 2,
+            PreviewSite._websiteDetails.siteVisibility ?? ""
+        );
     }
 
     public static async clearCache(websiteUrl: string | undefined): Promise<void> {
@@ -237,9 +274,9 @@ export class PreviewSite {
 
                     progress.report({ message: Messages.GETTING_WEBSITE_ENDPOINT });
 
-                    await PreviewSite.loadSiteUrl(getWorkspaceFolders());
+                    await PreviewSite.loadSiteDetails(getWorkspaceFolders());
 
-                    if (this._websiteUrl === "") {
+                    if (!PreviewSite._websiteDetails?.websiteUrl) {
                         shouldRepeatLoginFlow = true;
                     }
                 }
 
@@ -19,7 +19,7 @@ import { SiteTreeItem } from "../../../../power-pages/actions-hub/tree-items/Sit
 import { IWebsiteInfo } from "../../../../power-pages/actions-hub/models/IWebsiteInfo";
 import PacContext from "../../../../pac/PacContext";
 import { CloudInstance, EnvironmentType } from "../../../../pac/PacTypes";
-import { IWebsiteDetails } from "../../../../../common/services/Interfaces";
+import { IOtherSiteInfo, IWebsiteDetails } from "../../../../../common/services/Interfaces";
 import * as CommandHandlers from "../../../../power-pages/actions-hub/ActionsHubCommandHandlers";
 
 // Add global type declaration for ArtemisContext
@@ -166,6 +166,55 @@ describe("ActionsHubTreeDataProvider", () => {
             await registerCommandStub.getCall(10).args[1]();
             expect(mockCommandHandler.calledOnce).to.be.true;
         });
+
+        //command "microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite"
+        it("should register uploadSite command", async () => {
+            const mockCommandHandler = sinon.stub(CommandHandlers, 'uploadSite');
+            mockCommandHandler.resolves();
+            const actionsHubTreeDataProvider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
+            actionsHubTreeDataProvider["registerPanel"](pacTerminal);
+
+            expect(registerCommandStub.calledWith("microsoft.powerplatform.pages.actionsHub.activeSite.uploadSite")).to.be.true;
+
+            await registerCommandStub.getCall(11).args[1]();
+            expect(mockCommandHandler.calledOnce).to.be.true;
+        });
+
+        it("should register siteDetails command", async () => {
+            const mockCommandHandler = sinon.stub(CommandHandlers, 'showSiteDetails');
+            mockCommandHandler.resolves();
+            const actionsHubTreeDataProvider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
+            actionsHubTreeDataProvider["registerPanel"](pacTerminal);
+
+            expect(registerCommandStub.calledWith("microsoft.powerplatform.pages.actionsHub.siteDetails")).to.be.true;
+
+            await registerCommandStub.getCall(12).args[1]();
+            expect(mockCommandHandler.calledOnce).to.be.true;
+        });
+
+        it("should register downloadSite command", async () => {
+            const mockCommandHandler = sinon.stub(CommandHandlers, 'downloadSite');
+            mockCommandHandler.resolves();
+            const actionsHubTreeDataProvider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
+            actionsHubTreeDataProvider["registerPanel"](pacTerminal);
+
+            expect(registerCommandStub.calledWith("microsoft.powerplatform.pages.actionsHub.activeSite.downloadSite")).to.be.true;
+
+            await registerCommandStub.getCall(13).args[1]();
+            expect(mockCommandHandler.calledOnce).to.be.true;
+        });
+
+        it('should register openSiteInStudio command', async () => {
+            const mockCommandHandler = sinon.stub(CommandHandlers, 'openInStudio');
+            mockCommandHandler.resolves();
+            const actionsHubTreeDataProvider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
+            actionsHubTreeDataProvider["registerPanel"](pacTerminal);
+
+            expect(registerCommandStub.calledWith("microsoft.powerplatform.pages.actionsHub.activeSite.openInStudio")).to.be.true;
+
+            await registerCommandStub.getCall(14).args[1]();
+            expect(mockCommandHandler.calledOnce).to.be.true;
+        });
     });
 
     describe('getTreeItem', () => {
@@ -184,7 +233,10 @@ describe("ActionsHubTreeDataProvider", () => {
             const mockInactiveSites = [
                 { name: "Bar", websiteRecordId: 'Bar', websiteUrl: "https://bar.com" }
             ] as IWebsiteDetails[];
-            sinon.stub(CommandHandlers, 'fetchWebsites').resolves({ activeSites: mockActiveSites, inactiveSites: mockInactiveSites });
+            const otherSites = [
+                { name: "Baz", websiteId: 'baz' }
+            ] as IOtherSiteInfo[];
+            sinon.stub(CommandHandlers, 'fetchWebsites').resolves({ activeSites: mockActiveSites, inactiveSites: mockInactiveSites, otherSites: otherSites });
 
             PacContext['_authInfo'] = null;
             const provider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
@@ -202,7 +254,10 @@ describe("ActionsHubTreeDataProvider", () => {
             const mockInactiveSites = [
                 { name: "Bar", websiteRecordId: 'Bar', websiteUrl: "https://bar.com" }
             ] as IWebsiteDetails[];
-            sinon.stub(CommandHandlers, 'fetchWebsites').resolves({ activeSites: mockActiveSites, inactiveSites: mockInactiveSites });
+            const otherSites = [
+                { name: "Baz", websiteId: 'baz' }
+            ] as IOtherSiteInfo[];
+            sinon.stub(CommandHandlers, 'fetchWebsites').resolves({ activeSites: mockActiveSites, inactiveSites: mockInactiveSites, otherSites: otherSites });
 
             sinon.stub(PacContext, "AuthInfo").get(() => ({
                 OrganizationFriendlyName: "TestOrg",
@@ -256,7 +311,7 @@ describe("ActionsHubTreeDataProvider", () => {
         it("should call element.getChildren when an element is passed", async () => {
             const element = new SiteTreeItem({} as IWebsiteInfo);
             const provider = ActionsHubTreeDataProvider.initialize(context, pacTerminal);
-            sinon.stub(CommandHandlers, 'fetchWebsites').resolves({ activeSites: [], inactiveSites: [] });
+            sinon.stub(CommandHandlers, 'fetchWebsites').resolves({ activeSites: [], inactiveSites: [], otherSites: [] });
             provider["_loadWebsites"] = false;
             const getChildrenStub = sinon.stub(element, "getChildren").resolves([]);
 
@@ -273,7 +328,10 @@ describe("ActionsHubTreeDataProvider", () => {
             const mockInactiveSites = [
                 { name: "Bar", websiteRecordId: 'Bar', websiteUrl: "https://bar.com" }
             ] as IWebsiteDetails[];
-            const mockFetchWebsites = sinon.stub(CommandHandlers, 'fetchWebsites').resolves({ activeSites: mockActiveSites, inactiveSites: mockInactiveSites });
+            const otherSites = [
+                { name: "Baz", websiteId: 'baz' }
+            ] as IOtherSiteInfo[];
+            const mockFetchWebsites = sinon.stub(CommandHandlers, 'fetchWebsites').resolves({ activeSites: mockActiveSites, inactiveSites: mockInactiveSites, otherSites: otherSites });
 
             PacContext['_authInfo'] = {
                 OrganizationFriendlyName: "TestOrg",
 
@@ -8,9 +8,9 @@ import { expect } from "chai";
 import { ActionsHubTreeItem } from "../../../../../power-pages/actions-hub/tree-items/ActionsHubTreeItem";
 
 class MockTreeItem extends ActionsHubTreeItem {
-    constructor() {
+    constructor(label: string | null = "Foo") {
         super(
-            "Foo",
+            label,
             vscode.TreeItemCollapsibleState.Collapsed,
             "iconPath",
             "contextValue",
@@ -32,6 +32,12 @@ describe('ActionsHubTreeItem', () => {
         expect(treeItem.label).to.be.equal("Foo");
     });
 
+    it('should have expected label when null is passed', () => {
+        const treeItem = new MockTreeItem(null);
+
+        expect(treeItem.tooltip).to.be.equal("");
+    });
+
     it('should have the expected collapsible state', () => {
         const treeItem = new MockTreeItem();
 
 
@@ -59,11 +59,8 @@ describe('ActiveGroupTreeItem', () => {
         });
 
         describe('when active sites is not empty', () => {
-            beforeEach(() => {
-                sinon.stub(CurrentSiteContext, 'currentSiteId').value('1');
-            });
-
             it('should return an array of SiteTreeItem', () => {
+                sinon.stub(CurrentSiteContext, 'currentSiteId').value('1');
                 const activeWebsites: IWebsiteDetails[] = [
                     {
                         websiteRecordId: "1",
@@ -85,7 +82,7 @@ describe('ActiveGroupTreeItem', () => {
                         dataModel: WebsiteDataModel.Enhanced,
                         environmentId: "env2",
                         siteVisibility: "private",
-                        siteManagementUrl: "http://site1.com/manage"
+                        siteManagementUrl: "http://site2.com/manage"
                     }
                 ];
 
@@ -113,6 +110,71 @@ describe('ActiveGroupTreeItem', () => {
                     status: WebsiteStatus.Active,
                     isCurrent: false,
                     siteVisibility: "private",
+                    siteManagementUrl: "http://site2.com/manage"
+                });
+            });
+
+            it('should return an array of SiteTreeItem when site id is empty', () => {
+                sinon.stub(CurrentSiteContext, 'currentSiteId').value('');
+                const activeWebsites: IWebsiteDetails[] = [
+                    {
+                        websiteRecordId: "",
+                        name: "Site 1",
+                        websiteUrl: "http://site1.com",
+                        dataverseInstanceUrl: "http://dataverse1.com",
+                        dataverseOrganizationId: "org1",
+                        dataModel: WebsiteDataModel.Standard,
+                        environmentId: "env1",
+                        siteVisibility: "public",
+                        siteManagementUrl: "http://site1.com/manage"
+                    }
+                ];
+
+                const treeItem = new ActiveGroupTreeItem(activeWebsites);
+                const children = treeItem.getChildren();
+
+                const site1 = children[0] as SiteTreeItem;
+                expect(site1.siteInfo).to.deep.equal({
+                    name: 'Site 1',
+                    websiteId: '',
+                    dataModelVersion: 1,
+                    websiteUrl: 'http://site1.com',
+                    status: WebsiteStatus.Active,
+                    isCurrent: false,
+                    siteVisibility: "public",
+                    siteManagementUrl: "http://site1.com/manage"
+                });
+            });
+
+            it('should return an array of SiteTreeItem when site id is empty', () => {
+                sinon.stub(CurrentSiteContext, 'currentSiteId').value(null);
+                const activeWebsites: IWebsiteDetails[] = [
+                    {
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                        websiteRecordId: null!,
+                        name: "Site 1",
+                        websiteUrl: "http://site1.com",
+                        dataverseInstanceUrl: "http://dataverse1.com",
+                        dataverseOrganizationId: "org1",
+                        dataModel: WebsiteDataModel.Standard,
+                        environmentId: "env1",
+                        siteVisibility: "public",
+                        siteManagementUrl: "http://site1.com/manage"
+                    }
+                ];
+
+                const treeItem = new ActiveGroupTreeItem(activeWebsites);
+                const children = treeItem.getChildren();
+
+                const site1 = children[0] as SiteTreeItem;
+                expect(site1.siteInfo).to.deep.equal({
+                    name: 'Site 1',
+                    websiteId: null,
+                    dataModelVersion: 1,
+                    websiteUrl: 'http://site1.com',
+                    status: WebsiteStatus.Active,
+                    isCurrent: false,
+                    siteVisibility: "public",
                     siteManagementUrl: "http://site1.com/manage"
                 });
             });
 
@@ -10,31 +10,31 @@ import { OtherSitesGroupTreeItem } from "../../../../../power-pages/actions-hub/
 
 describe('OtherSitesGroupTreeItem', () => {
     it('should be of type ActionsHubTreeItem', () => {
-        const treeItem = new OtherSitesGroupTreeItem();
+        const treeItem = new OtherSitesGroupTreeItem([]);
 
         expect(treeItem).to.be.instanceOf(ActionsHubTreeItem);
     });
 
     it('should have the expected label', () => {
-        const treeItem = new OtherSitesGroupTreeItem();
+        const treeItem = new OtherSitesGroupTreeItem([]);
 
         expect(treeItem.label).to.be.equal("Other Sites");
     });
 
     it('should have the expected collapsibleState', () => {
-        const treeItem = new OtherSitesGroupTreeItem();
+        const treeItem = new OtherSitesGroupTreeItem([]);
 
         expect(treeItem.collapsibleState).to.be.equal(vscode.TreeItemCollapsibleState.Collapsed);
     });
 
     it('should have the expected icon', () => {
-        const treeItem = new OtherSitesGroupTreeItem();
+        const treeItem = new OtherSitesGroupTreeItem([]);
 
         expect((treeItem.iconPath as vscode.ThemeIcon).id).to.be.equal('archive');
     });
 
     it('should have the expected contextValue', () => {
-        const treeItem = new OtherSitesGroupTreeItem();
+        const treeItem = new OtherSitesGroupTreeItem([]);
 
         expect(treeItem.contextValue).to.be.equal("otherSitesGroup");
     });
 
@@ -72,35 +72,35 @@ describe('PreviewSite', () => {
         const mockWorkspaceFolders = [{ uri: 'test/path', name: 'test', index: 0 }];
 
         beforeEach(() => {
-            PreviewSite['_websiteUrl'] = undefined;
+            PreviewSite['_websiteDetails'] = undefined;
         });
 
         it('should set website URL when getWebSiteUrl returns valid URL', async () => {
             // Arrange
             const expectedUrl = 'https://test-website.com';
             const getWebSiteUrlStub = sandbox.stub();
-            getWebSiteUrlStub.resolves(expectedUrl);
-            PreviewSite['getWebSiteUrl'] = getWebSiteUrlStub;
+            getWebSiteUrlStub.resolves({ url: expectedUrl, dataModel: 'Enhanced'});
+            PreviewSite['getWebsiteDetails'] = getWebSiteUrlStub;
 
             // Act
-            await PreviewSite.loadSiteUrl(mockWorkspaceFolders);
+            await PreviewSite.loadSiteDetails(mockWorkspaceFolders);
 
             // Assert
-            expect(PreviewSite['_websiteUrl']).to.equal(expectedUrl);
+            expect(PreviewSite['_websiteDetails']).to.deep.equal({ url: expectedUrl, dataModel: 'Enhanced' })
             expect(getWebSiteUrlStub.calledOnceWith(mockWorkspaceFolders)).to.be.true;
         });
 
-        it('should set empty string when getWebSiteUrl returns empty string', async () => {
+        it('should set details when getWebSiteUrl returns empty URL string', async () => {
             // Arrange
             const getWebSiteUrlStub = sandbox.stub();
-            getWebSiteUrlStub.resolves('');
-            PreviewSite['getWebSiteUrl'] = getWebSiteUrlStub;
+            getWebSiteUrlStub.resolves({ url: '', dataModel: 'Enhanced'});
+            PreviewSite['getWebsiteDetails'] = getWebSiteUrlStub;
 
             // Act
-            await PreviewSite.loadSiteUrl(mockWorkspaceFolders);
+            await PreviewSite.loadSiteDetails(mockWorkspaceFolders);
 
             // Assert
-            expect(PreviewSite['_websiteUrl']).to.equal('');
+            expect(PreviewSite['_websiteDetails']).to.deep.equal({ url: '', dataModel: 'Enhanced' });
             expect(getWebSiteUrlStub.calledOnceWith(mockWorkspaceFolders)).to.be.true;
         });
     });
 
@@ -19,72 +19,84 @@ describe("validationDiagnostics", () => {
         sinon.restore();
     });
 
-    it("validateTextDocument_whenPattrenDoesNot_shouldNotSetValueInDiagnostics", async () => {
+    it("validateTextDocument_whenPatternDoesNot_shouldNotSetValueInDiagnostics", async () => {
         //Act
         const filePath = path.join(
             __dirname,
             "..",
             "..",
             "..",
             "..",
-            "/src/client/test/Integration/MockValidationDiagnosticsTextDoc.txt"
+            "src",
+            "client",
+            "test",
+            "Integration",
+            "MockValidationDiagnosticsTextDoc.txt"
         );
 
-        const uri = vscode.Uri.parse(path.join("file:///", filePath));
+        const uri = vscode.Uri.file(filePath);
         const patterns = [/z/g];
         const searchByName = true;
         //Action
         await validateTextDocument(uri, patterns, searchByName);
         //Assert
         const connection = await vscode.languages.getDiagnostics();
         expect(connection[0][0].scheme).eq("file");
-        expect(connection[0][0].path).eq("/\\" + filePath);
+        expect(connection[0][0].path.replace(/[/\\]/g, '')).eq(filePath.replace(/[/\\]/g, ''));
         expect(connection[0][1]).empty;
     });
 
-    it("validateTextDocument_whenPattrenIsEmptyArray_shouldNotSetValueInDiagnostics", async () => {
+    it("validateTextDocument_whenPatternIsEmptyArray_shouldNotSetValueInDiagnostics", async () => {
         //Act
         const filePath = path.join(
             __dirname,
             "..",
             "..",
             "..",
             "..",
-            "/src/client/test/Integration/MockValidationDiagnosticsTextDoc.txt"
+            "src",
+            "client",
+            "test",
+            "Integration",
+            "MockValidationDiagnosticsTextDoc.txt"
         );
 
-        const uri = vscode.Uri.parse(path.join("file:///", filePath));
+        const uri = vscode.Uri.file(filePath);
         const patterns: RegExp[] = [];
         const searchByName = true;
         //Action
         await validateTextDocument(uri, patterns, searchByName);
         //Assert
         const connection = await vscode.languages.getDiagnostics();
         expect(connection[0][0].scheme).eq("file");
-        expect(connection[0][0].path).eq("/\\" + filePath);
+        expect(connection[0][0].path.replace(/[/\\]/g, '')).eq(filePath.replace(/[/\\]/g, ''));
         expect(connection[0][1]).empty;
     });
 
-    it("validateTextDocument_whenPattrenMatchAndSearchByNameIsTrue_shouldSetValueInDiagnostics", async () => {
+    it("validateTextDocument_whenPatternMatchAndSearchByNameIsTrue_shouldSetValueInDiagnostics", async () => {
         //Act
         const filePath = path.join(
             __dirname,
             "..",
             "..",
             "..",
             "..",
-            "/src/client/test/Integration/MockValidationDiagnosticsTextDoc.txt"
+            "src",
+            "client",
+            "test",
+            "Integration",
+            "MockValidationDiagnosticsTextDoc.txt"
         );
 
-        const uri = vscode.Uri.parse(path.join("file:///", filePath));
+        const uri = vscode.Uri.file(filePath);
         const patterns = [/keyword/g, /contains/g];
         const searchByName = true;
         //Action
         await validateTextDocument(uri, patterns, searchByName);
         //Assert
         const connection = await vscode.languages.getDiagnostics();
         expect(connection[0][0].scheme).eq("file");
-        expect(connection[0][0].path).eq("/\\" + filePath);
+        expect(connection[0][0].path.replace(/[/\\]/g, '')).eq(filePath.replace(/[/\\]/g, ''));
 
         expect(connection[0][1][0].message).eq(
             'PowerPages: File might be referenced by name keyword here.'
@@ -107,26 +119,30 @@ describe("validationDiagnostics", () => {
         expect(connection[0][1][1].range).not.undefined;
     });
 
-    it("validateTextDocument_whenPattrenMatchAndSearchByNameIsFalse_shouldSetValueInDiagnostics", async () => {
+    it("validateTextDocument_whenPatternMatchAndSearchByNameIsFalse_shouldSetValueInDiagnostics", async () => {
         //Act
         const filePath = path.join(
             __dirname,
             "..",
             "..",
             "..",
             "..",
-            "/src/client/test/Integration/MockValidationDiagnosticsTextDoc.txt"
+            "src",
+            "client",
+            "test",
+            "Integration",
+            "MockValidationDiagnosticsTextDoc.txt"
         );
 
-        const uri = vscode.Uri.parse(path.join("file:///", filePath));
+        const uri = vscode.Uri.file(filePath);
         const patterns = [/keyword/g, /contains/g];
         const searchByName = false;
         //Action
         await validateTextDocument(uri, patterns, searchByName);
         //Assert
         const connection = await vscode.languages.getDiagnostics();
         expect(connection[0][0].scheme).eq("file");
-        expect(connection[0][0].path).eq("/\\" + filePath);
+        expect(connection[0][0].path.replace(/[/\\]/g, '')).eq(filePath.replace(/[/\\]/g, ''));
 
         expect(connection[0][1][0].message).eq("PowerPages: ");
         expect(connection[0][1][1].message).eq("PowerPages: ");
 
@@ -116,12 +116,12 @@ export class OneDSLogger implements ITelemetryLogger {
         if ((coreConfig.instrumentationKey ?? "") !== "") {
             this.appInsightsCore.initialize(coreConfig, []);
         }
-        this.intitializeContextInfo();
+        this.initializeContextInfo();
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.appInsightsCore.addTelemetryInitializer(this.populateCommonAttributes());
     }
 
-    private intitializeContextInfo() {
+    private initializeContextInfo() {
         OneDSLogger.contextInfo = {
             orgId: "",
             portalId: "",
 
@@ -12,10 +12,10 @@ import { OneDSLogger } from "./oneDSLogger";
 
 export class oneDSLoggerWrapper {
     private static instance: oneDSLoggerWrapper;
-    private static oneDSLoggerIntance: OneDSLogger;
+    private static oneDSLoggerInstance: OneDSLogger;
 
     private constructor(geo?: string, geoLongName?: string) {
-        oneDSLoggerWrapper.oneDSLoggerIntance = new OneDSLogger(geo, geoLongName);
+        oneDSLoggerWrapper.oneDSLoggerInstance = new OneDSLogger(geo, geoLongName);
     }
 
 
@@ -31,7 +31,7 @@ export class oneDSLoggerWrapper {
     public traceInfo(eventName: string, eventInfo?: object, measurement?: object) {
         try {
             if (!isCustomTelemetryEnabled()) return;
-            oneDSLoggerWrapper.oneDSLoggerIntance.traceInfo(eventName, eventInfo, measurement);
+            oneDSLoggerWrapper.oneDSLoggerInstance.traceInfo(eventName, eventInfo, measurement);
         } catch (exception) {
             console.warn(exception);
         }
@@ -41,7 +41,7 @@ export class oneDSLoggerWrapper {
     public traceWarning(eventName: string, eventInfo?: object, measurement?: object) {
         try {
             if (!isCustomTelemetryEnabled()) return;
-            oneDSLoggerWrapper.oneDSLoggerIntance.traceWarning(eventName, eventInfo, measurement);
+            oneDSLoggerWrapper.oneDSLoggerInstance.traceWarning(eventName, eventInfo, measurement);
         } catch (exception) {
             console.warn(exception);
         }
@@ -51,7 +51,7 @@ export class oneDSLoggerWrapper {
     public traceError(eventName: string, errorMessage: string, exception: Error, eventInfo?: object, measurement?: object) {
         try {
             if (!isCustomTelemetryEnabled()) return;
-            oneDSLoggerWrapper.oneDSLoggerIntance.traceError(eventName, errorMessage, exception, eventInfo, measurement);
+            oneDSLoggerWrapper.oneDSLoggerInstance.traceError(eventName, errorMessage, exception, eventInfo, measurement);
         } catch (exception) {
             console.warn("Caught exception processing the telemetry event: " + exception);
             console.warn(exception);
@@ -62,7 +62,7 @@ export class oneDSLoggerWrapper {
     public featureUsage(featureName: string, eventName: string, customDimensions?: object) {
         try {
             if (!isCustomTelemetryEnabled()) return;
-            oneDSLoggerWrapper.oneDSLoggerIntance.featureUsage(featureName, eventName, customDimensions);
+            oneDSLoggerWrapper.oneDSLoggerInstance.featureUsage(featureName, eventName, customDimensions);
         } catch (exception) {
             console.warn(exception);
         }
 
@@ -41,6 +41,8 @@ export const PORTAL_YEOMAN_GENERATOR_PACKAGE_TARBALL_NAME = "microsoft-generator
 
 export const SUCCESS = "Success";
 
+export const TRUE = "True";
+
 // Define the schema for file extensions
 export const componentTypeSchema: { [key: string]: { [key: string]: string } } = {
     'adx_webpage': {
 
@@ -195,6 +195,9 @@ export class PowerPagesCopilot implements vscode.WebviewViewProvider {
                         WORKING_ON_IT_MESSAGE: vscode.l10n.t("Working on it..."),
                         GITHUB_COPILOT_CHAT: vscode.l10n.t('You can use this in <a href="#" id="github-copilot-link">GitHub Copilot with @powerpages</a> and leverage best of both world.'),
                         NEW_BADGE: vscode.l10n.t("NEW"),
+                        COPILOT_RESPONSE: vscode.l10n.t("Copilot Response"),
+                        CODE_BLOCK: vscode.l10n.t("Code Block "),
+                        CODE_BLOCK_END: vscode.l10n.t(" End of Code Block "),
                     };
 
                     this.sendMessageToWebview({
 
@@ -299,13 +299,19 @@
         const messageWrapper = document.createElement("div");
         messageWrapper.classList.add("message-wrapper");
 
+        // Add a visually hidden live region for screen readers
+        const liveRegion = document.createElement("div");
+        liveRegion.setAttribute("aria-live", "polite");
+        liveRegion.setAttribute("role", "status");
+        liveRegion.setAttribute("aria-atomic", "true");
+        liveRegion.classList.add("sr-only"); //corresponding CSS
+        messageWrapper.appendChild(liveRegion);
+
         const messageElement = document.createElement("div");
         const makerElement = createCopilotSection();
         messageElement.appendChild(makerElement);
         messageElement.appendChild(document.createElement("br"));
-
         messageElement.classList.add("message", "api-response");
-
         messageWrapper.appendChild(messageElement);
 
         if (!chatMessages) {
@@ -317,15 +323,15 @@
             updateThinking: function (thinkingMessage) {
                 const thinking = document.createElement("div");
                 thinking.classList.add("thinking");
-                thinking.setAttribute("tabindex", "0"); // Make the element focusable
-                thinking.setAttribute("role", "status"); // Add ARIA role
+                thinking.setAttribute("tabindex", "0");
+                thinking.setAttribute("role", "status");
                 messageElement.appendChild(thinking);
                 chatMessages.scrollTop = chatMessages.scrollHeight - chatMessages.clientHeight;
 
-                //This is necessary because
-// screen readers may not immediately detect content updates if they occur synchronously
+                // Update both visual and screen reader elements
                 setTimeout(() => {
                     thinking.innerText = thinkingMessage;
+                    liveRegion.innerText = thinkingMessage; // Announce to screen readers
                 }, 0);
             },
             updateResponse: function (apiResponse) {
@@ -344,18 +350,28 @@
                 }
 
                 messages.push(message);
-
                 messageIndex++;
 
                 const apiResponseElement = parseCodeBlocks(apiResponse);
                 apiResponseElement.setAttribute("aria-live", "assertive"); // Add aria-live attribute to response
                 messageElement.appendChild(apiResponseElement);
 
-                messageWrapper.dataset.id = message.id;
+                // Create screen reader friendly version
+                let screenReaderText = copilotStrings.COPILOT_RESPONSE;
+                apiResponse.forEach(item => {
+                    screenReaderText += item.displayText + " ";
+                    if (item.code && !skipCodes.includes(item.code)) {
+                        const codeBlockStart = copilotStrings.CODE_BLOCK;
+                        const codeBlockEnd = copilotStrings.CODE_BLOCK_END;
+                        screenReaderText += codeBlockStart + item.code + codeBlockEnd;
+                    }
+                });
 
-                messageWrapper.appendChild(document.createElement("hr"));
+                // Update the live region for screen readers
+                liveRegion.innerText = screenReaderText;
 
-                // Add feedback session for the API response
+                messageWrapper.dataset.id = message.id;
+                messageWrapper.appendChild(document.createElement("hr"));
                 const feedback = createFeedbackDiv();
                 messageWrapper.appendChild(feedback);
                 chatMessages.scrollTop = chatMessages.scrollHeight - chatMessages.clientHeight;
 
@@ -247,7 +247,7 @@ a {
 }
 
 a:focus {
-  color: var(--vscode-textLink-foreground);   
+  color: var(--vscode-textLink-foreground);
   outline: 2px solid var(--vscode-textLink-activeForeground);
   outline-offset: 2px;
 }
@@ -354,3 +354,15 @@ hr {
   font-size: 9px;
   /* margin-right: 2px; */
 }
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border-width: 0;
+}
@@ -218,3 +218,31 @@ function parseYamlContent(content: string, sessionID: string, dataverseEntity: s
         return {};
     }
 }
+
+
+//make call to https://org955590f3.crm10.dynamics.com/api/data/v9.2/EntityDefinitions(LogicalName='powerpagesite') to check if the response object contains MetadataId
+export async function isEdmEnvironment(orgUrl: string, apiToken: string): Promise<boolean> {
+    try {
+        const dataverseURL = `${orgUrl.endsWith('/') ? orgUrl : orgUrl.concat('/')}api/data/v9.2/EntityDefinitions(LogicalName='powerpagesite')`;
+        const requestInit: RequestInit = {
+            method: "GET",
+            headers: {
+                'Content-Type': "application/json",
+                Authorization: `Bearer ${apiToken}`,
+                "x-ms-user-agent": getUserAgent()
+            },
+        };
+
+        const startTime = performance.now();
+        const jsonResponse = await fetchJsonResponse(dataverseURL, requestInit);
+        const endTime = performance.now();
+        const responseTime = endTime - startTime || 0;
+
+        sendTelemetryEvent({ eventName: isEdmEnvironment.name, durationInMills: responseTime, orgUrl: orgUrl })
+        return jsonResponse.MetadataId !== undefined
+
+    } catch (error) {
+        sendTelemetryEvent({ eventName: isEdmEnvironment.name, error: error as Error, orgUrl: orgUrl})
+        return false;
+    }
+}
@@ -171,7 +171,7 @@ function getWebviewContent(feedbackCssUri: vscode.Uri, feedbackJsUri: vscode.Uri
     <textarea id="feedbackText" name="feedbackText" rows="5" required></textarea>
     <br/>
     <p class="privacy-statement">"${vscode.l10n.t('Try and be as specific as possible. Your feedback will be used to improve Copilot. <a href="https://privacy.microsoft.com/en-US/data-privacy-notice"> View privacy details </a>')}"</p>
-    <button tabindex="0" type="submit" class="submit-feedback">"${vscode.l10n.t('Submit')}"</button>
+    <button tabindex="0" type="submit" title="${vscode.l10n.t('Submit')}" class="submit-feedback">"${vscode.l10n.t('Submit')}"</button>
   </form>
   <script type="module" nonce="${nonce}" src="${feedbackJsUri}"></script>
   </body>
 
@@ -30,7 +30,6 @@ body {
     color: var(--vscode-button-foreground);
     cursor: pointer;
     padding: 6px 11px;
-    outline: 1px solid transparent;
     outline-offset: 2px !important;
     border-radius: 2px;
-}
+}
@@ -46,3 +46,21 @@ export interface IWebsiteDetails {
     type?: WebsiteApplicationType;
     siteManagementUrl: string;
 }
+
+export interface IOtherSiteInfo {
+    name: string;
+    websiteId: string;
+    folderPath: string;
+}
+
+export interface WebsiteYaml {
+    adx_defaultbotconsumerid?: string;
+    adx_defaultlanguage?: string;
+    adx_footerwebtemplateid?: string;
+    adx_headerwebtemplateid?: string;
+    adx_name?: string;
+    adx_statecode?: number;
+    adx_statuscode?: number;
+    adx_website_language?: number | string;
+    adx_websiteid?: string;
+}
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ export class PacTerminal implements vscode.Disposable {`
`76`	`76`	`vscode.env.openExternal(vscode.Uri.parse('https://aka.ms/powerplatform-vscode-lab'));`
`77`	`77`	`}`
`78`	`78`
`79`		`- private static getTerminal(): vscode.Terminal {`
	`79`	`+ public static getTerminal(): vscode.Terminal {`
`80`	`80`	`const terminal = vscode.window.activeTerminal ?`
`81`	`81`	`vscode.window.activeTerminal as vscode.Terminal :`
`82`	`82`	`vscode.window.createTerminal();`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ export class PacWrapper {`
`164`	`164`	`return this.executeCommandAndParseResults<PacOrgWhoOutput>(new PacArguments("org", "who"));`
`165`	`165`	`}`
`166`	`166`
`167`		`- public async activeAuth(): Promise <PacAuthWhoOutput> {`
	`167`	`+ public async activeAuth(): Promise<PacAuthWhoOutput> {`
`168`	`168`	`return this.executeCommandAndParseResults<PacAuthWhoOutput>(new PacArguments("auth", "who"));`
`169`	`169`	`}`
`170`	`170`
`@@ -180,6 +180,10 @@ export class PacWrapper {`
`180`	`180`	`return this.executeCommandAndParseResults<PacOutput>(new PacArguments("telemetry", "disable"));`
`181`	`181`	`}`
`182`	`182`
	`183`	`+ public async pendingChanges(websitePath: string, dataModelVersion: 1 \| 2): Promise<PacOutput> {`
	`184`	`+ return this.executeCommandAndParseResults<PacOutput>(new PacArguments("pages", "pending-changes", "-p", websitePath, "-mv", dataModelVersion.toString()));`
	`185`	`+ }`
	`186`	`+`
`183`	`187`	`public exit(): void {`
`184`	`188`	`this.pacInterop.exit();`
`185`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,5 @@ export interface IWebsiteInfo {`
`14`	`14`	`isCurrent: boolean;`
`15`	`15`	`siteVisibility: string;`
`16`	`16`	`siteManagementUrl: string;`
	`17`	`+ folderPath?: string;`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,12 @@ export class OneDSLogger implements ITelemetryLogger {`
`116`	`116`	`if ((coreConfig.instrumentationKey ?? "") !== "") {`
`117`	`117`	`this.appInsightsCore.initialize(coreConfig, []);`
`118`	`118`	`}`
`119`		`- this.intitializeContextInfo();`
	`119`	`+ this.initializeContextInfo();`
`120`	`120`	`// eslint-disable-next-line @typescript-eslint/no-explicit-any`
`121`	`121`	`this.appInsightsCore.addTelemetryInitializer(this.populateCommonAttributes());`
`122`	`122`	`}`
`123`	`123`
`124`		`- private intitializeContextInfo() {`
	`124`	`+ private initializeContextInfo() {`
`125`	`125`	`OneDSLogger.contextInfo = {`
`126`	`126`	`orgId: "",`
`127`	`127`	`portalId: "",`