Fix a bug where the add_to_history settable wasn't being respected

Also:
- Added a couple helper methods to safely handle interactions with prompt-toolkit history without requiring type casting

Author: tleonhardt

cmd2/cmd2.py

@@ -2902,9 +2902,6 @@ def _complete_statement(self, line: str) -> Statement:
         if not statement.command:
             raise EmptyStatement
 
-        # Add the complete command to prompt-toolkit's history.
-        cast(Cmd2History, self.main_session.history).add_command(statement.raw)
-
         return statement
 
     def _input_line_to_statement(self, line: str) -> Statement:
@@ -3176,12 +3173,11 @@ def onecmd(self, statement: Statement | str, *, add_to_history: bool = True) ->
         func = self.cmd_func(statement.command)
         if func:
             # Check to see if this command should be stored in history
-            if (
-                statement.command not in self.exclude_from_history
-                and statement.command not in self.disabled_commands
-                and add_to_history
-            ):
-                self.history.append(statement)
+            if statement.command not in self.disabled_commands and add_to_history:
+                if statement.command not in self.exclude_from_history:
+                    self.history.append(statement)
+
+                self._add_to_pt_history(statement.raw)
 
             try:
                 self.current_command = statement
@@ -3202,6 +3198,7 @@ def default(self, statement: Statement) -> bool | None:
         if self.default_to_shell:
             if 'shell' not in self.exclude_from_history:
                 self.history.append(statement)
+                self._add_to_pt_history(statement.raw)
             return self.do_shell(statement.command_and_args)
 
         err_msg = self.default_error.format(statement.command)
@@ -3236,6 +3233,16 @@ def _is_tty_session(session: PromptSession[str]) -> bool:
         # tests to inject PipeInput for programmatic interaction.
         return not isinstance(session.input, DummyInput)
 
+    def _add_to_pt_history(self, line: str) -> None:
+        """Add a command to the prompt-toolkit UI history if it's a Cmd2History instance."""
+        if hasattr(self, 'main_session') and isinstance(self.main_session.history, Cmd2History):
+            self.main_session.history.add_command(line)
+
+    def _clear_pt_history(self) -> None:
+        """Clear the prompt-toolkit UI history if it's a Cmd2History instance."""
+        if hasattr(self, 'main_session') and isinstance(self.main_session.history, Cmd2History):
+            self.main_session.history.clear()
+
     def _read_raw_input(
         self,
         prompt: Callable[[], ANSI | str] | ANSI | str,
@@ -5005,7 +5012,7 @@ def do_history(self, args: argparse.Namespace) -> bool | None:
 
             # Clear command and prompt-toolkit history
             self.history.clear()
-            cast(Cmd2History, self.main_session.history).clear()
+            self._clear_pt_history()
 
             if self.persistent_history_file:
                 try: