Update

Author: Alon Yeshurun

src/fabric_cli/commands/config/fab_config_get.py

@@ -15,14 +15,19 @@ def exec_command(args: Namespace) -> None:
     # Backward compatibility: 'mode' is no longer a configurable setting.
     # Phase 1: warn but still return the runtime mode so existing scripts don't break.
     if key == fab_constant.FAB_MODE:
-        utils_ui.print_warning(
-            "The 'mode' setting is deprecated and will be removed in a future release. "
-            "Run 'fab' without arguments to enter REPL mode, "
-            "or use 'fab <command>' for command-line mode."
-        )
         from fabric_cli.core.fab_context import Context
 
-        utils_ui.print_output_format(args, data=Context().get_runtime_mode())
+        runtime_mode = Context().get_runtime_mode()
+        msg = "The 'mode' setting is deprecated. "
+        if runtime_mode == fab_constant.FAB_MODE_INTERACTIVE:
+            msg += "Run 'exit' to leave the REPL, then use 'fab <command>' for command-line mode."
+        else:
+            msg += (
+                "Run 'fab' without arguments to enter REPL mode, "
+                "or use 'fab <command>' for command-line mode."
+            )
+        utils_ui.print_warning(msg)
+        utils_ui.print_output_format(args, data=runtime_mode)
         return
 
     if key not in fab_constant.FAB_CONFIG_KEYS_TO_VALID_VALUES:

src/fabric_cli/commands/config/fab_config_set.py

@@ -21,11 +21,17 @@ def exec_command(args: Namespace) -> None:
     # Backward compatibility: 'mode' is no longer a configurable setting.
     # Phase 1: warn but still honour the request so existing scripts don't break.
     if key == fab_constant.FAB_MODE:
-        utils_ui.print_warning(
-            "The 'mode' setting is deprecated and will be removed in a future release. "
-            "Run 'fab' without arguments to enter REPL mode, "
-            "or use 'fab <command>' for command-line mode."
-        )
+        from fabric_cli.core.fab_context import Context
+
+        msg = "The 'mode' setting is deprecated. "
+        if Context().get_runtime_mode() == fab_constant.FAB_MODE_INTERACTIVE:
+            msg += "Run 'exit' to leave the REPL, then use 'fab <command>' for command-line mode."
+        else:
+            msg += (
+                "Run 'fab' without arguments to enter REPL mode, "
+                "or use 'fab <command>' for command-line mode."
+            )
+        utils_ui.print_warning(msg)
         if value == fab_constant.FAB_MODE_INTERACTIVE:
             from fabric_cli.core.fab_interactive import start_interactive_mode
 

src/fabric_cli/core/fab_output.py

@@ -3,7 +3,7 @@
 
 import json
 from argparse import Namespace
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Any, Dict, List, Optional, cast
 
@@ -96,7 +96,7 @@ def __init__(
             The data parameter is always converted to a list format internally.
             Error codes are only included in the output when status is Failed.
         """
-        self._timestamp = datetime.utcnow().isoformat() + "Z"
+        self._timestamp = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
         self._status = status
         self._command = command
         self._subcommand = subcommand

tests/test_commands/test_config.py

@@ -6,6 +6,7 @@
 import pytest
 
 import fabric_cli.core.fab_constant as constant
+from fabric_cli.core.fab_context import Context
 from fabric_cli.errors import ErrorMessages
 from tests.test_commands.commands_parser import CLIExecutor
 from tests.test_commands.data.static_test_data import StaticTestData
@@ -172,11 +173,16 @@ def test_config_clear_cache_success(
     # endregion
 
 
-DEPRECATION_WARNING = (
-    "The 'mode' setting is deprecated and will be removed in a future release. "
+DEPRECATION_PREFIX = "The 'mode' setting is deprecated. "
+DEPRECATION_COMMANDLINE_SUFFIX = (
     "Run 'fab' without arguments to enter REPL mode, "
     "or use 'fab <command>' for command-line mode."
 )
+DEPRECATION_INTERACTIVE_SUFFIX = (
+    "Run 'exit' to leave the REPL, then use 'fab <command>' for command-line mode."
+)
+DEPRECATION_WARNING_COMMANDLINE = DEPRECATION_PREFIX + DEPRECATION_COMMANDLINE_SUFFIX
+DEPRECATION_WARNING_INTERACTIVE = DEPRECATION_PREFIX + DEPRECATION_INTERACTIVE_SUFFIX
 
 
 class TestConfigModeDeprecated:
@@ -193,7 +199,7 @@ def test_config_set_mode_interactive_warns_and_launches_repl_success(
         """'config set mode interactive' must warn and launch REPL."""
         cli_executor.exec_command(f"config set mode {constant.FAB_MODE_INTERACTIVE}")
 
-        mock_print_warning.assert_called_once_with(DEPRECATION_WARNING)
+        mock_print_warning.assert_called_once_with(DEPRECATION_WARNING_INTERACTIVE)
         mock_repl.assert_called_once()
 
     @pytest.mark.parametrize("mode_value", [
@@ -206,7 +212,20 @@ def test_config_set_mode_non_interactive_warns_without_repl_success(
         """'config set mode command_line' (or bogus) must warn but not launch REPL."""
         cli_executor.exec_command(f"config set mode {mode_value}")
 
-        mock_print_warning.assert_called_once_with(DEPRECATION_WARNING)
+        mock_print_warning.assert_called_once_with(DEPRECATION_WARNING_INTERACTIVE)
+        mock_repl.assert_not_called()
+
+    def test_config_set_mode_in_commandline_warns_with_fab_hint_success(
+        self, mock_print_warning, mock_repl, cli_executor: CLIExecutor
+    ):
+        """'config set mode command_line' in command-line mode must show fab hint."""
+        Context().set_runtime_mode(constant.FAB_MODE_COMMANDLINE)
+        try:
+            cli_executor.exec_command(f"config set mode {constant.FAB_MODE_COMMANDLINE}")
+        finally:
+            Context().set_runtime_mode(constant.FAB_MODE_INTERACTIVE)
+
+        mock_print_warning.assert_called_once_with(DEPRECATION_WARNING_COMMANDLINE)
         mock_repl.assert_not_called()
 
     def test_config_set_non_mode_key_still_works_success(
@@ -222,7 +241,20 @@ def test_config_get_mode_warns_and_returns_runtime_mode_success(
         """'config get mode' must warn and return the runtime mode."""
         cli_executor.exec_command("config get mode")
 
-        mock_print_warning.assert_any_call(DEPRECATION_WARNING)
+        mock_print_warning.assert_any_call(DEPRECATION_WARNING_INTERACTIVE)
+        mock_questionary_print.assert_called()
+
+    def test_config_get_mode_in_commandline_warns_with_fab_hint_success(
+        self, mock_questionary_print, mock_print_warning, cli_executor: CLIExecutor
+    ):
+        """'config get mode' in command-line mode must show fab hint."""
+        Context().set_runtime_mode(constant.FAB_MODE_COMMANDLINE)
+        try:
+            cli_executor.exec_command("config get mode")
+        finally:
+            Context().set_runtime_mode(constant.FAB_MODE_INTERACTIVE)
+
+        mock_print_warning.assert_any_call(DEPRECATION_WARNING_COMMANDLINE)
         mock_questionary_print.assert_called()
 
     def test_config_get_non_mode_key_still_works_success(