Remove redundant scanner facade alias seams

Author: GitHub Copilot

src/prism/scanner.py

@@ -82,20 +82,12 @@
 from .scanner_analysis import (
     build_scanner_report_markdown as _runbook_report_build_scanner_report_markdown,
     extract_scanner_counters as _analysis_extract_scanner_counters,
-    build_runbook_rows as _analysis_build_runbook_rows,
     render_runbook as _runbook_report_render_runbook,
     render_runbook_csv as _runbook_report_render_runbook_csv,
 )
 from .scanner_readme import (
     _append_scanner_report_section_if_enabled as _readme_append_scanner_report_section_if_enabled,
-    _compose_section_body as _readme_compose_section_body,
-    _generated_merge_markers as _readme_generated_merge_markers,
-    _render_guide_identity_sections as _readme_render_guide_identity_sections,
     _render_guide_section_body as _readme_render_guide_section_body,
-    _render_readme_with_style_guide as _readme_render_readme_with_style_guide,
-    _resolve_ordered_style_sections as _readme_resolve_ordered_style_sections,
-    _resolve_section_content_mode as _readme_resolve_section_content_mode,
-    _strip_prior_generated_merge_block as _readme_strip_prior_generated_merge_block,
     normalize_style_heading,
     parse_style_readme,
 )
@@ -899,24 +891,15 @@ def load_readme_section_config(
     )
 
 
-_render_guide_identity_sections = _readme_render_guide_identity_sections
-
-
 _render_guide_section_body = partial(
     _readme_render_guide_section_body,
     variable_guidance_keywords=_VARIABLE_GUIDANCE_KEYWORDS,
 )
 
 
-_generated_merge_markers = _readme_generated_merge_markers
-_strip_prior_generated_merge_block = _readme_strip_prior_generated_merge_block
-_resolve_section_content_mode = _readme_resolve_section_content_mode
-_compose_section_body = _readme_compose_section_body
-_resolve_ordered_style_sections = _readme_resolve_ordered_style_sections
 _append_scanner_report_section_if_enabled = (
     _readme_append_scanner_report_section_if_enabled
 )
-_render_readme_with_style_guide = _readme_render_readme_with_style_guide
 
 
 _build_scanner_report_markdown = partial(
@@ -925,15 +908,6 @@ def load_readme_section_config(
 )
 
 
-_extract_scanner_counters = _analysis_extract_scanner_counters
-
-
-_build_runbook_rows = _analysis_build_runbook_rows
-
-
-_build_requirements_display = _runbook_report_build_requirements_display
-
-
 _resolve_scan_identity = partial(
     _scan_discovery_resolve_scan_identity,
     load_meta_fn=load_meta,
@@ -974,29 +948,22 @@ def _apply_readme_section_config(
         )
 
 
-_attach_external_vars_context = _variable_insights.attach_external_vars_context
-
-
 _build_undocumented_default_filters = partial(
     _variable_insights.build_undocumented_default_filters,
     extract_default_target_var=_extract_default_target_var,
     looks_secret_name=_looks_secret_name,
     resembles_password_like=_resembles_password_like,
 )
 
-
-_build_display_variables = _variable_insights.build_display_variables
-
-
 _collect_variable_insights_and_default_filter_findings = partial(
     _variable_insights.collect_variable_insights_and_default_filter_findings,
     build_variable_insights=build_variable_insights,
-    attach_external_vars_context=_attach_external_vars_context,
+    attach_external_vars_context=_variable_insights.attach_external_vars_context,
     collect_yaml_parse_failures=_collect_yaml_parse_failures,
     extract_role_notes_from_comments=_extract_role_notes_from_comments,
     build_undocumented_default_filters=_build_undocumented_default_filters,
-    extract_scanner_counters=_extract_scanner_counters,
-    build_display_variables=_build_display_variables,
+    extract_scanner_counters=_analysis_extract_scanner_counters,
+    build_display_variables=_variable_insights.build_display_variables,
 )
 
 
@@ -1043,7 +1010,7 @@ def _apply_readme_section_config(
 
 _apply_scan_metadata_configuration = partial(
     _scan_runtime.apply_scan_metadata_configuration,
-    build_requirements_display=_build_requirements_display,
+    build_requirements_display=_runbook_report_build_requirements_display,
     load_readme_section_config=load_readme_section_config,
     apply_readme_section_config=_apply_readme_section_config,
 )

src/prism/tests/test_scan_context.py

@@ -102,7 +102,7 @@ def test_scanner_variable_insight_collection_helper_is_flattened_partial_alias()
     assert helper.keywords["build_variable_insights"] is scanner.build_variable_insights
     assert (
         helper.keywords["attach_external_vars_context"]
-        is scanner._attach_external_vars_context
+        is scanner._variable_insights.attach_external_vars_context
     )
     assert (
         helper.keywords["collect_yaml_parse_failures"]

src/prism/tests/test_scanner_internals.py

@@ -1149,17 +1149,25 @@ def test_variable_extractor_wrapper_re_exports_canonical_implementation():
 
 
 def test_variable_insights_wrappers_re_export_canonical_implementations():
-    """Variable-insights scanner helpers should be canonical scanner_core aliases."""
+    """Variable-insights helpers resolve directly from canonical scanner_core."""
     from prism.scanner_core import variable_insights as canonical
 
     assert (
-        scanner._attach_external_vars_context is canonical.attach_external_vars_context
+        scanner._collect_variable_insights_and_default_filter_findings.keywords[
+            "attach_external_vars_context"
+        ]
+        is canonical.attach_external_vars_context
+    )
+    assert (
+        scanner._collect_variable_insights_and_default_filter_findings.keywords[
+            "build_display_variables"
+        ]
+        is canonical.build_display_variables
     )
-    assert scanner._build_display_variables is canonical.build_display_variables
 
 
 def test_runbook_bridge_wrappers_re_export_canonical_implementations():
-    """Runbook helper bridge keeps only canonical row helper on scanner module."""
+    """Runbook helper bridge keeps canonical module behavior and no facade wrappers."""
     from prism.scanner_analysis import (
         build_runbook_rows,
     )
@@ -1174,7 +1182,8 @@ def test_runbook_bridge_wrappers_re_export_canonical_implementations():
         ]
     }
 
-    assert scanner._build_runbook_rows(metadata) == build_runbook_rows(metadata)
+    rows = build_runbook_rows(metadata)
+    assert isinstance(rows, list)
     assert not hasattr(scanner, "render_runbook")
     assert not hasattr(scanner, "render_runbook_csv")