fix: if extensionHelpIndex is invalid, reload only extensions for refresh, not core modules also

Author: DanielMicrosoft

src/azure-cli-core/azure/cli/core/__init__.py

@@ -1186,6 +1186,16 @@ def get_help_index(self):
 
         return self._get_help_index_cached_local()
 
+    def needs_latest_extension_help_overlay_refresh(self):
+        """Return True when latest-profile top-level help should refresh extension help overlay."""
+        if self.cloud_profile != 'latest':
+            return False
+
+        if self._is_extension_help_index_valid():
+            return False
+
+        return self._has_non_always_loaded_extensions()
+
     def set_help_index(self, help_data):
         """Set the help index data.
 

src/azure-cli-core/azure/cli/core/commands/__init__.py

@@ -745,6 +745,13 @@ def _try_show_cached_help(self, args):
         command_index = CommandIndex(self.cli_ctx)
         help_index = command_index.get_help_index()
 
+        if not help_index and command_index.needs_latest_extension_help_overlay_refresh():
+            logger.debug("Top-level cached help is unavailable on latest profile. "
+                         "Refreshing extension help overlay without full core module load.")
+            # Unknown top-level command forces extension-only load path on latest profile.
+            self.commands_loader.load_command_table(['__refresh_extension_help_overlay__'])
+            help_index = command_index.get_help_index()
+
         if help_index:
             # Display cached help using the help system
             self.help.show_cached_help(help_index, args)

src/azure-cli-core/azure/cli/core/tests/test_help.py

@@ -743,6 +743,32 @@ def test_show_cached_help_output(self):
         finally:
             sys.stdout = sys.__stdout__
 
+    def test_try_show_cached_help_refreshes_latest_extension_overlay(self):
+        """Test top-level cached help retries after refreshing latest extension help overlay."""
+        from azure.cli.core import CommandIndex
+
+        invoker = self.test_cli.invocation_cls(
+            cli_ctx=self.test_cli,
+            commands_loader_cls=self.test_cli.commands_loader_cls,
+            parser_cls=self.test_cli.parser_cls,
+            help_cls=self.test_cli.help_cls)
+        self.test_cli.invocation = invoker
+
+        refreshed_help_data = {
+            'groups': {'vm': {'summary': 'Manage VMs.', 'tags': ''}},
+            'commands': {'version': {'summary': 'Show version.', 'tags': ''}}
+        }
+
+        with mock.patch.object(CommandIndex, 'get_help_index', side_effect=[None, refreshed_help_data]), \
+                mock.patch.object(CommandIndex, 'needs_latest_extension_help_overlay_refresh', return_value=True), \
+                mock.patch.object(invoker.commands_loader, 'load_command_table') as mock_load_cmd_table, \
+                mock.patch.object(invoker.help, 'show_cached_help') as mock_show_cached_help:
+            result = invoker._try_show_cached_help(['--help', '--debug'])
+
+        self.assertIsNotNone(result)
+        mock_load_cmd_table.assert_called_once_with(['__refresh_extension_help_overlay__'])
+        mock_show_cached_help.assert_called_once_with(refreshed_help_data, ['--help', '--debug'])
+
     # create a temporary file in the temp dir. Return the path of the file.
     def _create_new_temp_file(self, data, suffix=""):
         with tempfile.NamedTemporaryFile(mode='w', dir=self._tempdirName, delete=False, suffix=suffix) as f: