[CmdLineArgs] "--keepOpen" to keep the window/tab/pane open after the process/profile has exited.

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -576,6 +576,8 @@ void AppCommandlineArgs::_addNewTerminalArgs(AppCommandlineArgs::NewTerminalSubc
         _inheritEnvironment,
         RS_A(L"CmdInheritEnvDesc"));
 
+    subcommand.keepOpenOption = subcommand.subcommand->add_flag("-o,--keepOpen", _keepOpenOption, RS_A(L"CmdKeepOpenDesc"));
+
     // Using positionals_at_end allows us to support "wt new-tab -d wsl -d Ubuntu"
     // without CLI11 thinking that we've specified -d twice.
     // There's an alternate construction where we make all subcommands "prefix commands",
@@ -675,6 +677,11 @@ NewTerminalArgs AppCommandlineArgs::_getNewTerminalArgs(AppCommandlineArgs::NewT
     }
     args.ReloadEnvironmentVariables(!inheritEnv);
 
+    if (*subcommand.keepOpenOption)
+    {
+        args.KeepOpen(_keepOpenOption);
+    }
+
     return args;
 }
 
@@ -720,6 +727,7 @@ void AppCommandlineArgs::_resetStateToDefault()
     _commandline.clear();
     _suppressApplicationTitle = false;
     _appendCommandLineOption = false;
+    _keepOpenOption = false;
 
     _splitVertical = false;
     _splitHorizontal = false;

src/cascadia/TerminalApp/AppCommandlineArgs.h

@@ -69,6 +69,7 @@ class TerminalApp::AppCommandlineArgs final
         CLI::Option* colorSchemeOption;
         CLI::Option* appendCommandLineOption;
         CLI::Option* inheritEnvOption;
+        CLI::Option* keepOpenOption;
     };
 
     struct NewPaneSubcommand : public NewTerminalSubcommand
@@ -110,6 +111,8 @@ class TerminalApp::AppCommandlineArgs final
     std::vector<std::string> _commandline;
     bool _appendCommandLineOption{ false };
 
+    bool _keepOpenOption{ false };
+
     bool _splitVertical{ false };
     bool _splitHorizontal{ false };
     bool _splitDuplicate{ false };

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -905,4 +905,7 @@
   <data name="RestartConnectionToolTip" xml:space="preserve">
     <value>Restart the active pane connection</value>
   </data>
+  <data name="CmdKeepOpenDesc" xml:space="preserve">
+    <value>If set, the window/tab/pane will stay open after the command has exited. (It is he same as setting the profile termination behavior to never.)</value>
+  </data>
 </root>

src/cascadia/TerminalSettingsModel/ActionArgs.h

@@ -314,6 +314,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         ACTION_ARG(winrt::hstring, ColorScheme);
         ACTION_ARG(Windows::Foundation::IReference<bool>, Elevate, nullptr);
         ACTION_ARG(Windows::Foundation::IReference<bool>, ReloadEnvironmentVariables, nullptr);
+        ACTION_ARG(bool, KeepOpen, false)
         ACTION_ARG(uint64_t, ContentId);
 
         static constexpr std::string_view CommandlineKey{ "commandline" };
@@ -327,6 +328,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         static constexpr std::string_view ColorSchemeKey{ "colorScheme" };
         static constexpr std::string_view ElevateKey{ "elevate" };
         static constexpr std::string_view ReloadEnvironmentVariablesKey{ "reloadEnvironmentVariables" };
+        static constexpr std::string_view KeepOpenKey{ "keepOpen" };
         static constexpr std::string_view ContentKey{ "__content" };
 
     public:
@@ -349,6 +351,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                        otherAsUs->_ColorScheme == _ColorScheme &&
                        otherAsUs->_Elevate == _Elevate &&
                        otherAsUs->_ReloadEnvironmentVariables == _ReloadEnvironmentVariables &&
+                       otherAsUs->_KeepOpen == _KeepOpen &&
                        otherAsUs->_ContentId == _ContentId;
             }
             return false;
@@ -367,6 +370,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             JsonUtils::GetValueForKey(json, ColorSchemeKey, args->_ColorScheme);
             JsonUtils::GetValueForKey(json, ElevateKey, args->_Elevate);
             JsonUtils::GetValueForKey(json, ReloadEnvironmentVariablesKey, args->_ReloadEnvironmentVariables);
+            JsonUtils::GetValueForKey(json, KeepOpenKey, args->_KeepOpen);
             JsonUtils::GetValueForKey(json, ContentKey, args->_ContentId);
             return *args;
         }
@@ -388,6 +392,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             JsonUtils::SetValueForKey(json, ColorSchemeKey, args->_ColorScheme);
             JsonUtils::SetValueForKey(json, ElevateKey, args->_Elevate);
             JsonUtils::SetValueForKey(json, ReloadEnvironmentVariablesKey, args->_ReloadEnvironmentVariables);
+            JsonUtils::SetValueForKey(json, KeepOpenKey, args->_KeepOpen);
             JsonUtils::SetValueForKey(json, ContentKey, args->_ContentId);
             return json;
         }
@@ -404,6 +409,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             copy->_ColorScheme = _ColorScheme;
             copy->_Elevate = _Elevate;
             copy->_ReloadEnvironmentVariables = _ReloadEnvironmentVariables;
+            copy->_KeepOpen = _KeepOpen;
             copy->_ContentId = _ContentId;
             return *copy;
         }
@@ -425,6 +431,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             h.write(ColorScheme());
             h.write(Elevate());
             h.write(ReloadEnvironmentVariables());
+            h.write(KeepOpen());
             h.write(ContentId());
         }
     };

src/cascadia/TerminalSettingsModel/ActionArgs.idl

@@ -133,6 +133,7 @@ namespace Microsoft.Terminal.Settings.Model
         Windows.Foundation.IReference<Windows.UI.Color> TabColor;
         String Profile; // Either a GUID or a profile's name if the GUID isn't a match
         Boolean AppendCommandLine;
+        Boolean KeepOpen;
 
         // We use IReference<> to treat some args as nullable where null means
         // "use the inherited value". See ProfileIndex,

src/cascadia/TerminalSettingsModel/TerminalSettings.cpp

@@ -190,6 +190,11 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             {
                 defaultSettings.ReloadEnvironmentVariables(newTerminalArgs.ReloadEnvironmentVariables().Value());
             }
+
+            if (newTerminalArgs.KeepOpen())
+            {
+                defaultSettings.CloseOnExit(CloseOnExitMode::Never);
+            }
         }
 
         return settingsPair;
@@ -341,6 +346,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         _RepositionCursorWithMouse = profile.RepositionCursorWithMouse();
 
         _ReloadEnvironmentVariables = profile.ReloadEnvironmentVariables();
+
+        _CloseOnExit = profile.CloseOnExit();
     }
 
     // Method Description:

src/cascadia/TerminalSettingsModel/TerminalSettings.h

@@ -169,6 +169,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
         INHERITABLE_SETTING(Model::TerminalSettings, bool, ReloadEnvironmentVariables, true);
 
+        INHERITABLE_SETTING(Model::TerminalSettings, CloseOnExitMode, CloseOnExit, CloseOnExitMode::Automatic);
+
     private:
         std::optional<std::array<Microsoft::Terminal::Core::Color, COLOR_TABLE_SIZE>> _ColorTable;
         std::span<Microsoft::Terminal::Core::Color> _getColorTableImpl();

src/cascadia/TerminalSettingsModel/TerminalSettings.idl

@@ -46,5 +46,6 @@ namespace Microsoft.Terminal.Settings.Model
 
         Boolean Elevate;
         Boolean ReloadEnvironmentVariables;
+        CloseOnExitMode CloseOnExit;
     };
 }