Add WT_PROFILE_ID to the environment of the spawned process

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -17,6 +17,7 @@
 #include "TabRowControl.h"
 
 using namespace winrt;
+using namespace winrt::Windows::Foundation::Collections;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::System;
@@ -606,7 +607,13 @@ namespace winrt::TerminalApp::implementation
             // TODO GH#4661: Replace this with directly using the AzCon when our VT is better
             std::filesystem::path azBridgePath{ wil::GetModuleFileNameW<std::wstring>(nullptr) };
             azBridgePath.replace_filename(L"TerminalAzBridge.exe");
-            connection = TerminalConnection::ConptyConnection(azBridgePath.wstring(), L".", L"Azure", settings.InitialRows(), settings.InitialCols(), winrt::guid());
+            connection = TerminalConnection::ConptyConnection(azBridgePath.wstring(),
+                                                              L".",
+                                                              L"Azure",
+                                                              nullptr,
+                                                              settings.InitialRows(),
+                                                              settings.InitialCols(),
+                                                              winrt::guid());
         }
 
         else if (profile->HasConnectionType() &&
@@ -617,12 +624,23 @@ namespace winrt::TerminalApp::implementation
 
         else
         {
-            auto conhostConn = TerminalConnection::ConptyConnection(settings.Commandline(),
-                                                                    settings.StartingDirectory(),
-                                                                    settings.StartingTitle(),
-                                                                    settings.InitialRows(),
-                                                                    settings.InitialCols(),
-                                                                    winrt::guid());
+            std::wstring guidWString = Utils::GuidToString(profileGuid);
+
+            StringMap envMap{};
+            envMap.Insert(L"WT_DEFAULTS", _settings->GetDefaultSettingsPath());
+            envMap.Insert(L"WT_PROFILES", _settings->GetSettingsPath());
+            envMap.Insert(L"WT_PROFILE_ID", guidWString);
+            envMap.Insert(L"WSLENV", L"WT_DEFAULTS/p:WT_PROFILES/p:WT_PROFILE_ID");
+
+            auto conhostConn = TerminalConnection::ConptyConnection(
+                settings.Commandline(),
+                settings.StartingDirectory(),
+                settings.StartingTitle(),
+                envMap.GetView(),
+                settings.InitialRows(),
+                settings.InitialCols(),
+                winrt::guid());
+
             sessionGuid = conhostConn.Guid();
             connection = conhostConn;
         }

src/cascadia/TerminalConnection/ConptyConnection.cpp

@@ -13,7 +13,7 @@
 
 #include "ConptyConnection.g.cpp"
 
-#include "../../types/inc/Utils.hpp"
+#include "../../types/inc/utils.hpp"
 #include "../../types/inc/Environment.hpp"
 #include "LibraryResources.h"
 
@@ -110,7 +110,17 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             // Ensure every connection has the unique identifier in the environment.
             environment.insert_or_assign(L"WT_SESSION", guidSubStr.data());
 
+            if (_environment)
+            {
+                // add additional WT env vars like WT_PROFILES, WT_DEFAULTS and WT_PROFILE_ID
+                for (auto item : _environment)
+                {
+                    environment.insert_or_assign(item.Key().c_str(), item.Value().c_str());
+                }
+            }
+
             auto wslEnv = environment[L"WSLENV"]; // We always want to load something, even if it's blank.
+            //
             // WSLENV is a colon-delimited list of environment variables (+flags) that should appear inside WSL
             // https://devblogs.microsoft.com/commandline/share-environment-vars-between-wsl-and-windows/
             wslEnv = L"WT_SESSION:" + wslEnv; // prepend WT_SESSION to make sure it's visible inside WSL.
@@ -173,6 +183,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     ConptyConnection::ConptyConnection(const hstring& commandline,
                                        const hstring& startingDirectory,
                                        const hstring& startingTitle,
+                                       const Windows::Foundation::Collections::IMapView<hstring, hstring>& environment,
                                        const uint32_t initialRows,
                                        const uint32_t initialCols,
                                        const guid& initialGuid) :
@@ -181,6 +192,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         _commandline{ commandline },
         _startingDirectory{ startingDirectory },
         _startingTitle{ startingTitle },
+        _environment{ environment },
         _guid{ initialGuid },
         _u8State{},
         _u16Str{},

src/cascadia/TerminalConnection/ConptyConnection.h

@@ -19,7 +19,14 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 {
     struct ConptyConnection : ConptyConnectionT<ConptyConnection>, ConnectionStateHolder<ConptyConnection>
     {
-        ConptyConnection(const hstring& cmdline, const hstring& startingDirectory, const hstring& startingTitle, const uint32_t rows, const uint32_t cols, const guid& guid);
+        ConptyConnection(
+            const hstring& cmdline,
+            const hstring& startingDirectory,
+            const hstring& startingTitle,
+            const Windows::Foundation::Collections::IMapView<hstring, hstring>& environment,
+            const uint32_t rows,
+            const uint32_t cols,
+            const guid& guid);
 
         void Start();
         void WriteInput(hstring const& data);
@@ -40,6 +47,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         hstring _commandline;
         hstring _startingDirectory;
         hstring _startingTitle;
+        Windows::Foundation::Collections::IMapView<hstring, hstring> _environment;
         guid _guid{}; // A unique session identifier for connected client
         hstring _clientName{}; // The name of the process hosted by this ConPTY connection (as of launch).
 

src/cascadia/TerminalConnection/ConptyConnection.idl

@@ -8,7 +8,7 @@ namespace Microsoft.Terminal.TerminalConnection
     [default_interface]
     runtimeclass ConptyConnection : ITerminalConnection
     {
-        ConptyConnection(String cmdline, String startingDirectory, String startingTitle, UInt32 rows, UInt32 columns, Guid guid);
+        ConptyConnection(String cmdline, String startingDirectory, String startingTitle, IMapView<String,String> environment, UInt32 rows, UInt32 columns, Guid guid);
         Guid Guid { get; };
     };