From d16cfab0eab3b40b9696cd22dfc6856bf3c8326e Mon Sep 17 00:00:00 2001
From: Christopher Bays <cmbays91@gmail.com>
Date: Sun, 14 Jun 2026 12:06:58 -0400
Subject: [PATCH 1/2] =?UTF-8?q?#345=20=E2=80=94=20feat(explore):=20macro?=
 =?UTF-8?q?=20view=20filtered=20directory=20+=20dimmed=20impacted-model=20?=
 =?UTF-8?q?DAG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Finishes the explore macro view (cute-dbt#345, epic #99) — the two
remaining ACs after Slices 1–3 (#362/#364/#369):

- AC1 — filtered artifact directory: for the focused macro, a
  folder-grouped, collapsible directory (native <details>/<summary>, zero
  JS/egress) of ONLY the models + tests whose transitive
  depends_on.macros reaches it, mirroring project folders.
- AC3 — models and tests surfaced as SEPARATE partitions (never merged —
  the get_where_subquery non-merge rule), each grouped independently by
  the directory portion of original_file_path; pathless nodes bucket
  under "(no path)".

AC2 (impacted-model subgraph complement dimmed) shipped in Slice 3
(#369) as the .macro-downstream role-dim; AC4 (one shared domain
authority) is completed here — macro_blast_radius (models) and the new
macro_test_consumers (tests) both route through one
macro_resource_consumers walk, differing only in the resource-type
predicate. AC5 (EXPERIMENTAL-gated) holds — the explore page is already
experimental (#290).

Domain stays POD (the new fn is a pure reverse-walk); the folder
grouping is presentation in the explore adapter. render_explore takes a
new MacroFocus bundle (focus set + test consumers) so the renderer never
performs a domain walk (the explore-lane pure-renderer posture). The
explore-macro golden is regenerated byte-identical and now shows the
directory (3 callers across 2 folders, empty tests partition).

Tests: 8 new domain tests (macro_test_consumers — direct/transitive/
unit_test/vendor-exclude/null-package/unknown), 5 adapter tests (folder
grouping, partition separation, no-path sentinel, empty sets, end-to-end
render), 1 BDD scenario + 3 steps, 1 headless test (live-DOM directory
render + real collapse).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 examples/explore-macro/macro.html   |  51 ++++
 features/explore_macro_view.feature |  21 ++
 src/adapters/explore.rs             | 382 ++++++++++++++++++++++++++--
 src/cli/mod.rs                      |  47 ++--
 src/domain/macro_lens.rs            | 252 +++++++++++++++++-
 src/domain/mod.rs                   |   2 +-
 templates/explore-macro.html        |  59 +++++
 tests/headless_toggle.rs            |  61 +++++
 tests/headless_zero_egress.rs       |  12 +-
 tests/steps/explore_macro_view.rs   |  53 +++-
 10 files changed, 886 insertions(+), 54 deletions(-)

diff --git a/examples/explore-macro/macro.html b/examples/explore-macro/macro.html
index 5eff1691..ab426923 100644
--- a/examples/explore-macro/macro.html
+++ b/examples/explore-macro/macro.html
@@ -740,6 +740,25 @@
 .model-detail-card .detail-type { display: inline-block; margin-right: 0.35rem; padding: 0 0.4rem; border: 1.5px solid var(--dag-import-stroke); border-radius: 4px; color: var(--dag-node-text); font-size: 0.8rem; }
 .model-detail-card .detail-changed { display: inline-block; margin-left: 0.35rem; padding: 0 0.4rem; border: 1.5px solid var(--dag-import-stroke); border-radius: 4px; background: var(--dag-import-fill); color: var(--dag-node-text); box-shadow: 0 0 0 2px rgba(230, 159, 0, 0.55); font-size: 0.8rem; }
 .model-detail-card .detail-section-title { margin: 0.5rem 0 0.15rem; font-size: 0.85rem; color: var(--text-muted); font-weight: 600; text-transform: uppercase; letter-spacing: 0.03em; }
+/* cute-dbt#345 (AC1 + AC3) — the filtered artifact directory: the
+   folder-grouped models + tests that call the macro, surfaced as TWO
+   separate partitions (the get_where_subquery non-merge rule). Native
+   <details>/<summary> collapse (zero JS, zero egress); themed via the
+   shared semantic tokens. */
+.macro-directory { margin-top: 1.25rem; }
+.macro-directory > h2 { margin-bottom: 0.25rem; }
+.macro-directory-hint { color: var(--text-muted); font-size: 0.85rem; margin: 0 0 0.75rem; }
+.macro-partition { border: 1px solid var(--border); border-radius: 6px; background: var(--surface); padding: 0.5rem 0.85rem 0.75rem; margin-bottom: 0.75rem; }
+.macro-partition > h3 { font-size: 1rem; margin: 0.25rem 0 0.1rem; }
+.macro-partition-count { color: var(--text-muted); font-weight: 400; font-size: 0.85rem; }
+.macro-partition-empty { color: var(--text-faint); font-style: italic; font-size: 0.9rem; margin: 0.3rem 0 0; }
+.macro-folder { margin: 0.35rem 0 0; }
+.macro-folder > summary { cursor: pointer; font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-size: 0.85rem; color: var(--text-muted); padding: 0.1rem 0; }
+.macro-folder > summary:hover, .macro-folder > summary:focus { color: var(--text); }
+.macro-folder-files { list-style: none; margin: 0.2rem 0 0.3rem; padding-left: 1.2rem; }
+.macro-folder-files li { margin: 0.1rem 0; font-size: 0.9rem; overflow-wrap: anywhere; }
+.macro-entry-name { font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-weight: 600; }
+.macro-entry-file { color: var(--text-muted); font-size: 0.85rem; }
 </style>
 </head>
 <body>
@@ -782,6 +801,38 @@ <h1>Macro focus</h1>
 </section>
 
 
+<section class="macro-directory" aria-label="Filtered artifact directory">
+  <h2>What calls this macro</h2>
+  <p class="macro-directory-hint">Only the models and tests whose <code>depends_on.macros</code> reaches the macro &mdash; grouped by project folder, the two kinds kept separate.</p>
+
+  <div class="macro-partition" aria-label="Models that call the macro">
+    <h3>Models <span class="macro-partition-count">(3)</span></h3>
+    <details class="macro-folder" open>
+      <summary>models/intermediate/healthcare</summary>
+      <ul class="macro-folder-files">
+        <li data-node-id="model.healthcare_analytics.int_encounters__enriched"><span class="macro-entry-name">int_encounters__enriched</span> <span class="macro-entry-file">int_encounters__enriched.sql</span></li>
+        
+      </ul>
+    </details>
+    <details class="macro-folder" open>
+      <summary>models/marts/core</summary>
+      <ul class="macro-folder-files">
+        <li data-node-id="model.healthcare_analytics.fct_clinical_events"><span class="macro-entry-name">fct_clinical_events</span> <span class="macro-entry-file">fct_clinical_events.sql</span></li>
+        <li data-node-id="model.healthcare_analytics.fct_encounters"><span class="macro-entry-name">fct_encounters</span> <span class="macro-entry-file">fct_encounters.sql</span></li>
+        
+      </ul>
+    </details>
+    
+  </div>
+
+  <div class="macro-partition" aria-label="Tests that call the macro">
+    <h3>Tests <span class="macro-partition-count">(0)</span></h3>
+    <p class="macro-partition-empty">No root-project tests call this macro.</p>
+    
+  </div>
+</section>
+
+
 <script type="application/json" id="explore-dag-data">{"nodes":[{"id":"exposure.healthcare_analytics.provider_quality_dashboard","name":"provider_quality_dashboard","node_type":"exposure","not_compiled":false,"data_tests":0,"unit_tests":0,"badge":"","detail":{"description":null,"materialized":null,"tags":[],"meta":[],"columns":[],"grain":{"value":"unknown","source":"unknown","known":false,"detected":[]}},"paths":{"sql":null,"schema_yaml":null,"unit_tests":[]},"macro_role":"downstream"},{"id":"model.healthcare_analytics.fct_clinical_events","name":"fct_clinical_events","node_type":"model","not_compiled":false,"data_tests":22,"unit_tests":0,"badge":"22 data-tests · 0 unit-tests","detail":{"description":"Unified clinical events fact table combining conditions, medications, and procedures. Each row represents a single clinical event with standardized structure. Links to patient and encounter dimensions.\n","materialized":"table","tags":[],"meta":[],"columns":[{"name":"_loaded_at","data_type":null,"description":"Timestamp when record was loaded"},{"name":"clinical_event_key","data_type":null,"description":"Surrogate key for the clinical event"},{"name":"code","data_type":null,"description":"Clinical code (SNOMED-CT or RxNorm)"},{"name":"code_system","data_type":null,"description":"Code system (SNOMED-CT or RXNORM)"},{"name":"description","data_type":null,"description":"Description of the clinical event"},{"name":"encounter_id","data_type":null,"description":"Natural encounter identifier"},{"name":"encounter_key","data_type":null,"description":"Foreign key to fct_encounters (-1 for unknown)"},{"name":"event_cost","data_type":null,"description":"Cost of the clinical event"},{"name":"event_date_key","data_type":null,"description":"Foreign key to dim_date for event start"},{"name":"event_end_date","data_type":null,"description":"End date of the clinical event (null if ongoing or one-time)"},{"name":"event_id","data_type":null,"description":"Natural event identifier (condition_id, medication_id, or procedure_id)"},{"name":"event_start_date","data_type":null,"description":"Start date of the clinical event"},{"name":"event_type","data_type":null,"description":"Type of clinical event (CONDITION, MEDICATION, PROCEDURE)"},{"name":"patient_id","data_type":null,"description":"Natural patient identifier"},{"name":"patient_key","data_type":null,"description":"Foreign key to dim_patients (-1 for unknown)"},{"name":"reason_code","data_type":null,"description":"Clinical code for the reason of the event"},{"name":"reason_description","data_type":null,"description":"Description of the reason for the event"}],"grain":{"value":"clinical_event_key","source":"unique test","known":true,"detected":[{"kind":"unique test","value":"clinical_event_key","origin":"test.healthcare_analytics.unique_fct_clinical_events_clinical_event_key.2af827606b"}]}},"paths":{"sql":"models/marts/core/fct_clinical_events.sql","schema_yaml":"models/marts/core/_core__models.yml","unit_tests":[]},"macro_role":"user"},{"id":"model.healthcare_analytics.fct_cost_analysis","name":"fct_cost_analysis","node_type":"model","not_compiled":false,"data_tests":17,"unit_tests":0,"badge":"17 data-tests · 0 unit-tests","detail":{"description":"Detailed cost breakdown for financial analysis and revenue cycle management.\nOne row per encounter with cost allocation details across payer and patient.\nGrain: encounter_id\n\nUse cases:\n- Financial performance reporting\n- Payer mix analysis\n- Patient out-of-pocket tracking\n- Cost driver identification\n- Revenue cycle optimization\n","materialized":"table","tags":["analytics","marts","fact"],"meta":[{"key":"example_queries","value":"[{\"description\":\"Analyze cost distribution across different insurance payers\",\"name\":\"Cost breakdown by payer\",\"sql\":\"select\\n    py.payer_name\\n    , count(distinct fca.encounter_id) as encounter_count\\n    , round(sum(fca.total_cost), 2) as total_cost\\n    , round(sum(fca.payer_coverage), 2) as total_payer_coverage\\n    , round(sum(fca.patient_responsibility), 2) as total_patient_responsibility\\n    , round(avg(fca.coverage_pct), 2) as avg_coverage_pct\\nfrom main_marts.fct_cost_analysis fca\\njoin main_marts.dim_payers py\\n    on fca.payer_key = py.payer_key\\ngroup by py.payer_name\\norder by total_cost desc\"},{\"description\":\"Track cost trends over time for financial forecasting\",\"name\":\"Monthly cost trends\",\"sql\":\"select\\n    strftime(fca.encounter_date, '%Y-%m') as year_month\\n    , count(distinct fca.encounter_id) as encounter_count\\n    , round(sum(fca.total_cost), 2) as total_cost\\n    , round(avg(fca.total_cost), 2) as avg_cost_per_encounter\\n    , round(sum(fca.payer_coverage), 2) as total_payer_coverage\\n    , round(avg(fca.coverage_pct), 2) as avg_coverage_pct\\nfrom main_marts.fct_cost_analysis fca\\nwhere fca.year_actual >= 2023\\ngroup by 1\\norder by 1 desc\"},{\"description\":\"Compare costs across different encounter classes\",\"name\":\"Cost by encounter type\",\"sql\":\"select\\n    fca.encounter_class\\n    , count(distinct fca.encounter_id) as encounter_count\\n    , round(sum(fca.total_cost), 2) as total_cost\\n    , round(avg(fca.total_cost), 2) as avg_cost\\n    , round(avg(fca.procedure_count), 2) as avg_procedures\\n    , round(avg(fca.cost_per_procedure), 2) as avg_cost_per_procedure\\n    , round(avg(fca.coverage_pct), 2) as avg_coverage_pct\\nfrom main_marts.fct_cost_analysis fca\\ngroup by fca.encounter_class\\norder by total_cost desc\"},{\"description\":\"Identify individual high-cost encounters for review\",\"name\":\"High-cost encounters\",\"sql\":\"select\\n    fca.encounter_id\\n    , fca.encounter_date\\n    , fca.encounter_class\\n    , p.first_name || ' ' || p.last_name as patient_name\\n    , py.payer_name\\n    , fca.total_cost\\n    , fca.payer_coverage\\n    , fca.patient_responsibility\\n    , fca.procedure_count\\nfrom main_marts.fct_cost_analysis fca\\njoin main_marts.dim_patients p\\n    on fca.patient_key = p.patient_key\\njoin main_marts.dim_payers py\\n    on fca.payer_key = py.payer_key\\norder by fca.total_cost desc\\nlimit 25\"}]"},{"key":"grain","value":"encounter_id"},{"key":"owner","value":"healthcare_analytics"},{"key":"uses","value":"[\"Financial reporting\",\"Payer mix analysis\",\"Cost allocation tracking\",\"Revenue cycle management\"]"}],"columns":[{"name":"_loaded_at","data_type":null,"description":"Timestamp when record was loaded"},{"name":"cost_analysis_key","data_type":null,"description":"Surrogate key (MD5 hash of encounter_id)"},{"name":"cost_per_procedure","data_type":null,"description":"Average cost per procedure (null if no procedures)"},{"name":"coverage_pct","data_type":null,"description":"Percentage covered by insurance (0-100)"},{"name":"encounter_class","data_type":null,"description":"Type of encounter (ambulatory, wellness, etc.)"},{"name":"encounter_date","data_type":null,"description":"Date of the encounter"},{"name":"encounter_date_key","data_type":null,"description":"Foreign key to dim_date"},{"name":"encounter_id","data_type":null,"description":"Natural encounter identifier"},{"name":"encounter_key","data_type":null,"description":"Foreign key to fct_encounters"},{"name":"patient_cost_pct","data_type":null,"description":"Percentage owed by patient (0-100)"},{"name":"patient_id","data_type":null,"description":"Natural patient identifier"},{"name":"patient_key","data_type":null,"description":"Foreign key to dim_patients"},{"name":"patient_responsibility","data_type":null,"description":"Amount owed by patient"},{"name":"payer_coverage","data_type":null,"description":"Amount covered by insurance"},{"name":"payer_id","data_type":null,"description":"Natural payer identifier"},{"name":"payer_key","data_type":null,"description":"Foreign key to dim_payers"},{"name":"procedure_count","data_type":null,"description":"Number of procedures in the encounter"},{"name":"provider_id","data_type":null,"description":"Natural provider identifier"},{"name":"provider_key","data_type":null,"description":"Foreign key to dim_providers"},{"name":"total_cost","data_type":null,"description":"Total claim cost"},{"name":"year_actual","data_type":null,"description":"Calendar year of encounter"}],"grain":{"value":"encounter_id","source":"config.meta.grain","known":true,"detected":[{"kind":"config.meta.grain","value":"encounter_id","origin":"config.meta.grain"},{"kind":"unique test","value":"cost_analysis_key","origin":"test.healthcare_analytics.unique_fct_cost_analysis_cost_analysis_key.2aecf62159"},{"kind":"unique test","value":"encounter_id","origin":"test.healthcare_analytics.unique_fct_cost_analysis_encounter_id.c11ffc0f22"}]}},"paths":{"sql":"models/marts/analytics/fct_cost_analysis.sql","schema_yaml":"models/marts/analytics/_analytics__models.yml","unit_tests":[]},"macro_role":"downstream"},{"id":"model.healthcare_analytics.fct_encounters","name":"fct_encounters","node_type":"model","not_compiled":false,"data_tests":30,"unit_tests":0,"badge":"30 data-tests · 0 unit-tests","detail":{"description":"Encounter fact table containing healthcare visits/encounters. Links to patient, provider, organization, and payer dimensions. Includes date keys, costs, and derived duration.\n","materialized":"table","tags":[],"meta":[],"columns":[{"name":"_loaded_at","data_type":null,"description":"Timestamp when record was loaded"},{"name":"base_encounter_cost","data_type":null,"description":"Base cost of the encounter"},{"name":"duration_minutes","data_type":null,"description":"Duration of encounter in minutes"},{"name":"encounter_class","data_type":null,"description":"Type of encounter (ambulatory, wellness, emergency, etc.)"},{"name":"encounter_code","data_type":null,"description":"SNOMED CT code for the encounter type"},{"name":"encounter_description","data_type":null,"description":"Description of the encounter type"},{"name":"encounter_end_at","data_type":null,"description":"End timestamp of the encounter"},{"name":"encounter_end_date_key","data_type":null,"description":"Foreign key to dim_date for encounter end"},{"name":"encounter_id","data_type":null,"description":"Natural encounter identifier (UUID)"},{"name":"encounter_key","data_type":null,"description":"Surrogate key for the encounter"},{"name":"encounter_start_at","data_type":null,"description":"Start timestamp of the encounter"},{"name":"encounter_start_date_key","data_type":null,"description":"Foreign key to dim_date for encounter start"},{"name":"organization_id","data_type":null,"description":"Natural organization identifier"},{"name":"organization_key","data_type":null,"description":"Foreign key to dim_organizations (-1 for unknown)"},{"name":"patient_age_at_encounter","data_type":null,"description":"Patient's age at the time of the encounter"},{"name":"patient_id","data_type":null,"description":"Natural patient identifier"},{"name":"patient_key","data_type":null,"description":"Foreign key to dim_patients (-1 for unknown)"},{"name":"patient_responsibility","data_type":null,"description":"Amount patient is responsible for (total_claim_cost - payer_coverage)"},{"name":"payer_coverage","data_type":null,"description":"Amount covered by payer"},{"name":"payer_id","data_type":null,"description":"Natural payer identifier"},{"name":"payer_key","data_type":null,"description":"Foreign key to dim_payers (-1 for unknown)"},{"name":"provider_id","data_type":null,"description":"Natural provider identifier"},{"name":"provider_key","data_type":null,"description":"Foreign key to dim_providers (-1 for unknown)"},{"name":"reason_code","data_type":null,"description":"SNOMED CT code for the reason of visit"},{"name":"reason_description","data_type":null,"description":"Description of the reason for visit"},{"name":"total_claim_cost","data_type":null,"description":"Total claim cost"}],"grain":{"value":"encounter_id","source":"unique test","known":true,"detected":[{"kind":"unique test","value":"encounter_id","origin":"test.healthcare_analytics.unique_fct_encounters_encounter_id.ce88bae928"},{"kind":"unique test","value":"encounter_key","origin":"test.healthcare_analytics.unique_fct_encounters_encounter_key.a3b77e9141"}]}},"paths":{"sql":"models/marts/core/fct_encounters.sql","schema_yaml":"models/marts/core/_core__models.yml","unit_tests":[]},"macro_role":"user"},{"id":"model.healthcare_analytics.fct_encounters_monthly","name":"fct_encounters_monthly","node_type":"model","not_compiled":false,"data_tests":17,"unit_tests":0,"badge":"17 data-tests · 0 unit-tests","detail":{"description":"Monthly aggregated encounter statistics by encounter class. Provides counts, costs, and patient metrics grouped by year-month and encounter type.\n","materialized":"table","tags":[],"meta":[],"columns":[{"name":"_loaded_at","data_type":null,"description":"Timestamp when record was loaded"},{"name":"avg_duration_minutes","data_type":null,"description":"Average encounter duration in minutes"},{"name":"encounter_class","data_type":null,"description":"Type of encounter"},{"name":"encounter_count","data_type":null,"description":"Number of encounters in the month"},{"name":"month_actual","data_type":null,"description":"Month number (1-12)"},{"name":"total_claim_cost","data_type":null,"description":"Sum of total claim costs"},{"name":"total_patient_responsibility","data_type":null,"description":"Sum of patient responsibility amounts"},{"name":"total_payer_coverage","data_type":null,"description":"Sum of payer coverage amounts"},{"name":"unique_patients","data_type":null,"description":"Number of unique patients with encounters"},{"name":"year_actual","data_type":null,"description":"Year number"},{"name":"year_month","data_type":null,"description":"Year-month string (YYYY-MM format)"}],"grain":{"value":"unknown","source":"unknown","known":false,"detected":[]}},"paths":{"sql":"models/marts/core/fct_encounters_monthly.sql","schema_yaml":"models/marts/core/_core__models.yml","unit_tests":[]},"macro_role":"downstream"},{"id":"model.healthcare_analytics.fct_encounters_yearly","name":"fct_encounters_yearly","node_type":"model","not_compiled":false,"data_tests":14,"unit_tests":0,"badge":"14 data-tests · 0 unit-tests","detail":{"description":"Yearly aggregated encounter statistics by encounter class. Provides counts, costs, patient metrics, and encounters per patient ratio.\n","materialized":"table","tags":[],"meta":[],"columns":[{"name":"_loaded_at","data_type":null,"description":"Timestamp when record was loaded"},{"name":"avg_duration_minutes","data_type":null,"description":"Average encounter duration in minutes"},{"name":"encounter_class","data_type":null,"description":"Type of encounter"},{"name":"encounter_count","data_type":null,"description":"Number of encounters in the year"},{"name":"encounters_per_patient","data_type":null,"description":"Average number of encounters per patient"},{"name":"total_claim_cost","data_type":null,"description":"Sum of total claim costs"},{"name":"total_patient_responsibility","data_type":null,"description":"Sum of patient responsibility amounts"},{"name":"total_payer_coverage","data_type":null,"description":"Sum of payer coverage amounts"},{"name":"unique_patients","data_type":null,"description":"Number of unique patients with encounters"},{"name":"year_actual","data_type":null,"description":"Year number"}],"grain":{"value":"unknown","source":"unknown","known":false,"detected":[]}},"paths":{"sql":"models/marts/core/fct_encounters_yearly.sql","schema_yaml":"models/marts/core/_core__models.yml","unit_tests":[]},"macro_role":"downstream"},{"id":"model.healthcare_analytics.fct_patient_summary","name":"fct_patient_summary","node_type":"model","not_compiled":false,"data_tests":19,"unit_tests":0,"badge":"19 data-tests · 0 unit-tests","detail":{"description":"Annual patient-level aggregations for outcomes tracking and population health analysis.\nOne row per patient per calendar year with comprehensive utilization and cost metrics.\nGrain: (patient_id, year_actual)\n\nUse cases:\n- Patient outcomes tracking over time\n- Annual cost summaries and trends\n- Cohort analysis and patient stratification\n- Health trajectory visualization\n- High-cost patient identification\n","materialized":"table","tags":["analytics","marts","fact"],"meta":[{"key":"example_queries","value":"[{\"description\":\"Identify high-cost patients for care management programs\",\"name\":\"Top 10 costliest patients by year\",\"sql\":\"select\\n    p.patient_id\\n    , p.first_name || ' ' || p.last_name as patient_name\\n    , fps.year_actual\\n    , fps.total_cost\\n    , fps.encounter_count\\n    , fps.condition_count\\n    , fps.payer_coverage_pct\\nfrom main_marts.fct_patient_summary fps\\njoin main_marts.dim_patients p\\n    on fps.patient_key = p.patient_key\\nwhere fps.year_actual = 2024\\norder by fps.total_cost desc\\nlimit 10\"},{\"description\":\"Analyze patient population distribution and costs by age cohort\",\"name\":\"Patient count and cost by age group\",\"sql\":\"select\\n    case\\n        when fps.patient_age_at_year_end < 18 then '0-17'\\n        when fps.patient_age_at_year_end < 35 then '18-34'\\n        when fps.patient_age_at_year_end < 50 then '35-49'\\n        when fps.patient_age_at_year_end < 65 then '50-64'\\n        else '65+'\\n    end as age_group\\n    , count(distinct fps.patient_id) as patient_count\\n    , round(avg(fps.total_cost), 2) as avg_annual_cost\\n    , round(sum(fps.total_cost), 2) as total_cost\\n    , round(avg(fps.encounter_count), 2) as avg_encounters\\nfrom main_marts.fct_patient_summary fps\\nwhere fps.year_actual = 2024\\ngroup by 1\\norder by 1\"},{\"description\":\"Year-over-year comparison of costs and utilization metrics\",\"name\":\"Cost and utilization trends over time\",\"sql\":\"select\\n    fps.year_actual\\n    , count(distinct fps.patient_id) as patient_count\\n    , round(avg(fps.encounter_count), 2) as avg_encounters_per_patient\\n    , round(avg(fps.condition_count), 2) as avg_conditions_per_patient\\n    , round(avg(fps.total_cost), 2) as avg_annual_cost\\n    , round(sum(fps.total_cost), 2) as total_population_cost\\n    , round(avg(fps.payer_coverage_pct), 2) as avg_coverage_pct\\nfrom main_marts.fct_patient_summary fps\\ngroup by fps.year_actual\\norder by fps.year_actual desc\"},{\"description\":\"Find patients with above-average encounters and conditions\",\"name\":\"High utilization patients\",\"sql\":\"with averages as (\\n    select\\n        avg(encounter_count) as avg_encounters\\n        , avg(condition_count) as avg_conditions\\n    from main_marts.fct_patient_summary\\n    where year_actual = 2024\\n)\\nselect\\n    fps.patient_id\\n    , fps.encounter_count\\n    , fps.condition_count\\n    , fps.total_cost\\n    , fps.unique_providers\\nfrom main_marts.fct_patient_summary fps\\ncross join averages a\\nwhere fps.year_actual = 2024\\n    and fps.encounter_count > a.avg_encounters * 2\\n    and fps.condition_count > a.avg_conditions\\norder by fps.total_cost desc\\nlimit 25\"}]"},{"key":"grain","value":"patient_id + year_actual"},{"key":"owner","value":"healthcare_analytics"},{"key":"uses","value":"[\"Population health reporting\",\"Cost and utilization analysis\",\"Patient stratification\",\"Year-over-year trending\"]"}],"columns":[{"name":"_loaded_at","data_type":null,"description":"Timestamp when record was loaded"},{"name":"condition_count","data_type":null,"description":"Number of distinct conditions diagnosed in the year"},{"name":"encounter_count","data_type":null,"description":"Number of encounters in the year"},{"name":"patient_age_at_year_end","data_type":null,"description":"Patient age as of December 31 of the year"},{"name":"patient_id","data_type":null,"description":"Natural patient identifier"},{"name":"patient_key","data_type":null,"description":"Foreign key to dim_patients"},{"name":"patient_responsibility","data_type":null,"description":"Amount owed by patient (copay + coinsurance)"},{"name":"patient_summary_key","data_type":null,"description":"Surrogate key (MD5 hash of patient_id + year_actual)"},{"name":"payer_coverage","data_type":null,"description":"Amount covered by insurance"},{"name":"payer_coverage_pct","data_type":null,"description":"Percentage of costs covered by insurance (0-100)"},{"name":"procedure_count","data_type":null,"description":"Number of procedures in the year"},{"name":"total_cost","data_type":null,"description":"Total claim cost for the year"},{"name":"unique_organizations","data_type":null,"description":"Number of distinct organizations visited"},{"name":"unique_providers","data_type":null,"description":"Number of distinct providers seen"},{"name":"year_actual","data_type":null,"description":"Calendar year of the summary"}],"grain":{"value":"patient_id + year_actual","source":"config.meta.grain","known":true,"detected":[{"kind":"config.meta.grain","value":"patient_id + year_actual","origin":"config.meta.grain"},{"kind":"compound-unique test","value":"patient_id, year_actual","origin":"test.healthcare_analytics.dbt_utils_unique_combination_of_columns_fct_patient_summary_patient_id__year_actual.cdb3418166"},{"kind":"unique test","value":"patient_summary_key","origin":"test.healthcare_analytics.unique_fct_patient_summary_patient_summary_key.e532e1ff45"}]}},"paths":{"sql":"models/marts/analytics/fct_patient_summary.sql","schema_yaml":"models/marts/analytics/_analytics__models.yml","unit_tests":[]},"macro_role":"downstream"},{"id":"model.healthcare_analytics.fct_provider_metrics","name":"fct_provider_metrics","node_type":"model","not_compiled":false,"data_tests":20,"unit_tests":0,"badge":"20 data-tests · 0 unit-tests","detail":{"description":"Monthly provider-level utilization and performance metrics.\nOne row per provider per calendar month with patient volumes, costs, and efficiency metrics.\nGrain: (provider_id, year_actual, month_actual)\n\nUse cases:\n- Provider performance tracking\n- Workload distribution analysis\n- Cost efficiency comparisons\n- Capacity planning and staffing\n- Quality improvement initiatives\n","materialized":"table","tags":["analytics","marts","fact"],"meta":[{"key":"example_queries","value":"[{\"description\":\"Identify highest-volume providers for capacity planning\",\"name\":\"Top providers by patient volume\",\"sql\":\"select\\n    p.provider_id\\n    , p.name as provider_name\\n    , p.specialty\\n    , sum(fpm.encounter_count) as total_encounters\\n    , sum(fpm.unique_patient_count) as total_patients\\n    , round(avg(fpm.avg_cost_per_encounter), 2) as avg_cost_per_encounter\\nfrom main_marts.fct_provider_metrics fpm\\njoin main_marts.dim_providers p\\n    on fpm.provider_key = p.provider_key\\nwhere fpm.year_actual = 2024\\ngroup by 1, 2, 3\\norder by total_encounters desc\\nlimit 15\"},{\"description\":\"Track provider productivity over time\",\"name\":\"Provider metrics trend by month\",\"sql\":\"select\\n    fpm.year_month_str\\n    , count(distinct fpm.provider_id) as active_providers\\n    , sum(fpm.encounter_count) as total_encounters\\n    , sum(fpm.unique_patient_count) as total_patients\\n    , round(avg(fpm.avg_cost_per_encounter), 2) as avg_cost_per_encounter\\n    , round(avg(fpm.avg_encounter_duration_minutes), 2) as avg_duration_minutes\\nfrom main_marts.fct_provider_metrics fpm\\nwhere fpm.year_actual >= 2023\\ngroup by fpm.year_month_str\\norder by fpm.year_month_str desc\"},{\"description\":\"Compare providers by cost and volume efficiency\",\"name\":\"Provider efficiency comparison\",\"sql\":\"select\\n    p.provider_id\\n    , p.name as provider_name\\n    , p.specialty\\n    , sum(fpm.encounter_count) as total_encounters\\n    , round(sum(fpm.total_cost), 2) as total_cost\\n    , round(avg(fpm.avg_cost_per_encounter), 2) as avg_cost_per_encounter\\n    , round(avg(fpm.encounters_per_patient_avg), 2) as avg_encounters_per_patient\\n    , round(sum(fpm.total_procedures) * 1.0 / sum(fpm.encounter_count), 2) as procedures_per_encounter\\nfrom main_marts.fct_provider_metrics fpm\\njoin main_marts.dim_providers p\\n    on fpm.provider_key = p.provider_key\\nwhere fpm.year_actual = 2024\\ngroup by 1, 2, 3\\nhaving sum(fpm.encounter_count) >= 10\\norder by avg_cost_per_encounter\"}]"},{"key":"grain","value":"provider_id + year_month_str"},{"key":"owner","value":"healthcare_analytics"},{"key":"uses","value":"[\"Provider productivity reporting\",\"Workload balancing\",\"Cost efficiency analysis\",\"Capacity planning\"]"}],"columns":[{"name":"_loaded_at","data_type":null,"description":"Timestamp when record was loaded"},{"name":"avg_cost_per_encounter","data_type":null,"description":"Average cost per encounter"},{"name":"avg_encounter_duration_minutes","data_type":null,"description":"Average encounter duration in minutes"},{"name":"avg_patient_age","data_type":null,"description":"Average age of patients seen"},{"name":"encounter_count","data_type":null,"description":"Number of encounters in the month"},{"name":"encounters_per_patient_avg","data_type":null,"description":"Average encounters per patient"},{"name":"month_actual","data_type":null,"description":"Calendar month (1-12)"},{"name":"organization_id","data_type":null,"description":"Natural organization identifier"},{"name":"organization_key","data_type":null,"description":"Foreign key to dim_organizations"},{"name":"provider_id","data_type":null,"description":"Natural provider identifier"},{"name":"provider_key","data_type":null,"description":"Foreign key to dim_providers"},{"name":"provider_metrics_key","data_type":null,"description":"Surrogate key (MD5 hash of provider_id + year_month_str)"},{"name":"total_cost","data_type":null,"description":"Total claim cost for the month"},{"name":"total_payer_coverage","data_type":null,"description":"Amount covered by insurance"},{"name":"total_procedures","data_type":null,"description":"Total procedures performed"},{"name":"unique_patient_count","data_type":null,"description":"Number of distinct patients seen"},{"name":"year_actual","data_type":null,"description":"Calendar year"},{"name":"year_month_str","data_type":null,"description":"Year-month string (YYYY-MM)"}],"grain":{"value":"provider_id + year_month_str","source":"config.meta.grain","known":true,"detected":[{"kind":"config.meta.grain","value":"provider_id + year_month_str","origin":"config.meta.grain"},{"kind":"compound-unique test","value":"provider_id, year_actual, month_actual","origin":"test.healthcare_analytics.dbt_utils_unique_combination_of_columns_fct_provider_metrics_provider_id__year_actual__month_actual.a5b2cee14a"},{"kind":"unique test","value":"provider_metrics_key","origin":"test.healthcare_analytics.unique_fct_provider_metrics_provider_metrics_key.d58939d602"}]}},"paths":{"sql":"models/marts/analytics/fct_provider_metrics.sql","schema_yaml":"models/marts/analytics/_analytics__models.yml","unit_tests":[]},"macro_role":"downstream"},{"id":"model.healthcare_analytics.int_encounters__enriched","name":"int_encounters__enriched","node_type":"model","not_compiled":false,"data_tests":19,"unit_tests":0,"badge":"19 data-tests · 0 unit-tests","detail":{"description":"Enriched encounter model that aggregates clinical event counts and costs per encounter. Joins conditions, medications, and procedures to provide a complete view of each encounter's clinical activity and associated costs.\n","materialized":"view","tags":[],"meta":[],"columns":[{"name":"condition_count","data_type":null,"description":"Number of conditions diagnosed during this encounter"},{"name":"encounter_id","data_type":null,"description":"Unique encounter identifier (UUID), sourced from fct_encounters"},{"name":"medication_count","data_type":null,"description":"Number of medications prescribed during this encounter"},{"name":"procedure_count","data_type":null,"description":"Number of procedures performed during this encounter"},{"name":"total_condition_cost","data_type":null,"description":"Total cost associated with conditions (currently always 0 per model logic)"},{"name":"total_event_cost","data_type":null,"description":"Total cost of all clinical events (conditions + medications + procedures). Note: Condition costs are currently set to 0 in the model.\n"},{"name":"total_event_count","data_type":null,"description":"Total count of all clinical events (conditions + medications + procedures)"},{"name":"total_medication_cost","data_type":null,"description":"Total cost of medications prescribed during this encounter"},{"name":"total_procedure_cost","data_type":null,"description":"Total cost of procedures performed during this encounter"}],"grain":{"value":"encounter_id","source":"unique test","known":true,"detected":[{"kind":"unique test","value":"encounter_id","origin":"test.healthcare_analytics.unique_int_encounters__enriched_encounter_id.fdad6d4f82"}]}},"paths":{"sql":"models/intermediate/healthcare/int_encounters__enriched.sql","schema_yaml":"models/intermediate/healthcare/_healthcare__models.yml","unit_tests":[]},"macro_role":"user"},{"id":"model.healthcare_analytics.v_encounter_summary","name":"v_encounter_summary","node_type":"model","not_compiled":false,"data_tests":0,"unit_tests":0,"badge":"0 data-tests · 0 unit-tests","detail":{"description":"Enriched encounter view with dimension attributes for ad-hoc analysis.\nEphemeral (not persisted) - used as a building block for other queries.\nJoins encounters with patient, provider, organization, and payer details.\n\nUse cases:\n- Ad-hoc encounter analysis\n- Building block for custom reports\n- Quick encounter lookups with full context\n","materialized":"ephemeral","tags":["analytics","marts","view"],"meta":[],"columns":[{"name":"encounter_class","data_type":null,"description":"Type of encounter"},{"name":"encounter_date","data_type":null,"description":"Date of the encounter"},{"name":"encounter_id","data_type":null,"description":"Unique encounter identifier"},{"name":"organization_id","data_type":null,"description":"Organization identifier"},{"name":"organization_name","data_type":null,"description":"Organization name"},{"name":"patient_id","data_type":null,"description":"Patient identifier"},{"name":"patient_name","data_type":null,"description":"Full patient name"},{"name":"patient_responsibility","data_type":null,"description":"Amount owed by patient"},{"name":"payer_coverage","data_type":null,"description":"Amount covered by insurance"},{"name":"payer_id","data_type":null,"description":"Payer identifier"},{"name":"payer_name","data_type":null,"description":"Payer name"},{"name":"provider_id","data_type":null,"description":"Provider identifier"},{"name":"provider_name","data_type":null,"description":"Full provider name"},{"name":"total_cost","data_type":null,"description":"Total claim cost"}],"grain":{"value":"unknown","source":"unknown","known":false,"detected":[]}},"paths":{"sql":"models/marts/analytics/views/v_encounter_summary.sql","schema_yaml":"models/marts/analytics/_analytics__models.yml","unit_tests":[]},"macro_role":"downstream"},{"id":"model.healthcare_analytics.v_provider_active_patients","name":"v_provider_active_patients","node_type":"model","not_compiled":false,"data_tests":7,"unit_tests":0,"badge":"7 data-tests · 0 unit-tests","detail":{"description":"Active patient count per provider for panel management and workload analysis.\nAggregates patients with active conditions by their treating provider.\nGrain: provider_id\n\nUse cases:\n- Provider panel size management\n- Workload distribution analysis\n- Capacity planning\n- Provider assignment optimization\n","materialized":"table","tags":["analytics","marts","view"],"meta":[{"key":"example_queries","value":"[{\"description\":\"View provider workload by active patient and condition counts\",\"name\":\"Provider panel sizes\",\"sql\":\"select\\n    vpap.provider_id\\n    , vpap.provider_name\\n    , vpap.active_patient_count\\n    , vpap.total_active_conditions\\n    , vpap.avg_conditions_per_patient\\nfrom main_marts.v_provider_active_patients vpap\\nwhere vpap.active_patient_count > 0\\norder by vpap.active_patient_count desc\\nlimit 25\"},{\"description\":\"Analyze distribution of patient panels across providers\",\"name\":\"Provider workload distribution\",\"sql\":\"select\\n    case\\n        when vpap.active_patient_count = 0 then '0'\\n        when vpap.active_patient_count <= 10 then '1-10'\\n        when vpap.active_patient_count <= 50 then '11-50'\\n        when vpap.active_patient_count <= 100 then '51-100'\\n        else '100+'\\n    end as panel_size_bucket\\n    , count(*) as provider_count\\n    , sum(vpap.active_patient_count) as total_patients\\nfrom main_marts.v_provider_active_patients vpap\\ngroup by 1\\norder by 1\"}]"},{"key":"grain","value":"provider_id"},{"key":"owner","value":"healthcare_analytics"},{"key":"uses","value":"[\"Provider panel management\",\"Workload balancing\",\"Capacity planning\"]"}],"columns":[{"name":"active_patient_count","data_type":null,"description":"Number of patients with active conditions"},{"name":"avg_conditions_per_patient","data_type":null,"description":"Average number of active conditions per patient"},{"name":"organization_id","data_type":null,"description":"Natural organization identifier"},{"name":"organization_key","data_type":null,"description":"Foreign key to dim_organizations"},{"name":"provider_id","data_type":null,"description":"Natural provider identifier"},{"name":"provider_key","data_type":null,"description":"Foreign key to dim_providers"},{"name":"provider_name","data_type":null,"description":"Full name of the provider"},{"name":"total_active_conditions","data_type":null,"description":"Total number of active conditions managed"}],"grain":{"value":"provider_id","source":"config.meta.grain","known":true,"detected":[{"kind":"config.meta.grain","value":"provider_id","origin":"config.meta.grain"},{"kind":"unique test","value":"provider_id","origin":"test.healthcare_analytics.unique_v_provider_active_patients_provider_id.68f4dd3a27"},{"kind":"unique test","value":"provider_key","origin":"test.healthcare_analytics.unique_v_provider_active_patients_provider_key.95907c77fb"}]}},"paths":{"sql":"models/marts/analytics/views/v_provider_active_patients.sql","schema_yaml":"models/marts/analytics/_analytics__models.yml","unit_tests":[]},"macro_role":"downstream"}],"edges":[{"from":"model.healthcare_analytics.fct_encounters","to":"model.healthcare_analytics.fct_clinical_events"},{"from":"model.healthcare_analytics.fct_encounters","to":"model.healthcare_analytics.fct_cost_analysis"},{"from":"model.healthcare_analytics.fct_encounters","to":"model.healthcare_analytics.fct_encounters_monthly"},{"from":"model.healthcare_analytics.fct_encounters","to":"model.healthcare_analytics.fct_encounters_yearly"},{"from":"model.healthcare_analytics.fct_encounters","to":"model.healthcare_analytics.fct_patient_summary"},{"from":"model.healthcare_analytics.fct_encounters","to":"model.healthcare_analytics.fct_provider_metrics"},{"from":"model.healthcare_analytics.fct_encounters","to":"model.healthcare_analytics.int_encounters__enriched"},{"from":"model.healthcare_analytics.fct_encounters","to":"model.healthcare_analytics.v_encounter_summary"},{"from":"model.healthcare_analytics.fct_encounters","to":"model.healthcare_analytics.v_provider_active_patients"},{"from":"model.healthcare_analytics.fct_provider_metrics","to":"exposure.healthcare_analytics.provider_quality_dashboard"}],"cte_dags":{}}</script>
 
 <script>
diff --git a/features/explore_macro_view.feature b/features/explore_macro_view.feature
index deb48f96..5437eaac 100644
--- a/features/explore_macro_view.feature
+++ b/features/explore_macro_view.feature
@@ -74,3 +74,24 @@ Feature: explore emits a macro-focus sub-page only when a root macro changed
     And macro.html marks the model "dim_claims" as a macro "downstream"
     And macro.html does not render the model "unrelated"
     And the focused macro DAG carries exactly 2 nodes
+
+  # cute-dbt#345 (AC1 + AC3) — the filtered artifact directory. The macro
+  # page lists ONLY the models + tests that call the macro, grouped by
+  # project folder, the two kinds surfaced as SEPARATE partitions (never
+  # merged — the get_where_subquery non-merge rule). Here `stg_claims`
+  # (a model caller) appears in the models partition under its folder; no
+  # root-project test calls the macro, so the tests partition is an honest
+  # empty state.
+  @no-baseline-usage-error
+  Scenario: the macro page lists the calling models in a folder-grouped directory
+    Given the explore manifest declares the model "stg_claims"
+    And the explore model "stg_claims" has source path "models/staging/stg_claims.sql"
+    And the explore manifest carries the root-project macro "add_dq_flags" at "macros/add_dq_flags.sql"
+    And the explore model "stg_claims" calls the macro "add_dq_flags"
+    And the PR diff changes the explore file "macros/add_dq_flags.sql"
+    When I run cute-dbt explore on the macro manifest with the PR diff
+    Then the exit code is 0
+    And the explore out directory contains "macro.html"
+    And macro.html renders the filtered artifact directory
+    And the macro directory models partition lists "stg_claims" under "models/staging"
+    And the macro directory tests partition is empty
diff --git a/src/adapters/explore.rs b/src/adapters/explore.rs
index 0bc885b4..bac00efc 100644
--- a/src/adapters/explore.rs
+++ b/src/adapters/explore.rs
@@ -1129,6 +1129,120 @@ struct ExploreTest {
     shape: String,
 }
 
+/// The filtered artifact "directory" for the explore macro view
+/// (cute-dbt#345 — AC1 + AC3). For a focused macro: a folder-grouped
+/// listing of ONLY the models and ONLY the tests that (transitively) call
+/// it, surfaced as **two separate partitions** so the
+/// `get_where_subquery`-style test consumers never flood the model view.
+///
+/// The two partitions are populated from the ONE pure-domain authority
+/// (cute-dbt#345 AC4): `models` from `macro_blast_radius` (= the focus
+/// set's `users`) and `tests` from `macro_test_consumers`. This struct is
+/// pure presentation — the folder grouping + the per-partition counts —
+/// computed in the renderer over already-resolved domain id sets.
+struct MacroDirectory {
+    /// The model partition: folders of models whose `depends_on.macros`
+    /// closure reaches the macro. Mirrors the project's `models/**` tree.
+    models: Vec<MacroDirFolder>,
+    /// The tests partition: folders of `test`/`unit_test` nodes that reach
+    /// the macro — kept separate from `models` (the AC3 non-merge rule).
+    tests: Vec<MacroDirFolder>,
+    /// Total model entries across `models` (the partition header count).
+    model_count: usize,
+    /// Total test entries across `tests` (the partition header count).
+    test_count: usize,
+}
+
+/// One collapsible folder in a [`MacroDirectory`] partition — the
+/// directory portion of the members' `original_file_path`, with its
+/// entries (the `<details>`/`<summary>` group the template renders).
+struct MacroDirFolder {
+    /// The display folder path (e.g. `models/marts/core`), or the
+    /// `"(no path)"` sentinel for members whose manifest carries no
+    /// `original_file_path` (synthetic / pre-1.8 nodes — surfaced, never
+    /// silently dropped).
+    folder: String,
+    /// The members declared under this folder, in id order.
+    entries: Vec<MacroDirEntry>,
+}
+
+/// One artifact row in a [`MacroDirFolder`] — a model or test that calls
+/// the focused macro.
+struct MacroDirEntry {
+    /// Full manifest node id (the stable handle).
+    id: String,
+    /// Bare display name (the id's leaf segment).
+    name: String,
+    /// The member's file name (the last `original_file_path` segment), or
+    /// `None` when the manifest carries no path.
+    file: Option<String>,
+}
+
+/// Sentinel folder label for members the manifest gives no
+/// `original_file_path` (synthetic / pre-1.8 nodes). Surfacing them under
+/// a labeled bucket keeps the never-silently-dropped contract.
+const MACRO_DIR_NO_PATH: &str = "(no path)";
+
+/// Build a folder-grouped [`MacroDirectory`] partition from a set of node
+/// ids (cute-dbt#345). Each id is grouped by the directory portion of its
+/// `original_file_path`; folders sort by path and entries by id, so the
+/// output is deterministic (golden stability). An id absent from the
+/// manifest is skipped defensively (a dangling id never becomes a row).
+fn macro_dir_partition(
+    current: &Manifest,
+    ids: &std::collections::BTreeSet<NodeId>,
+) -> Vec<MacroDirFolder> {
+    // Group entries by folder path; BTreeMap keeps folders path-sorted and
+    // the BTreeSet input keeps each folder's entries id-sorted.
+    let mut by_folder: BTreeMap<String, Vec<MacroDirEntry>> = BTreeMap::new();
+    for id in ids {
+        let Some(node) = current.node(id) else {
+            continue;
+        };
+        let path = node.original_file_path();
+        let folder = path
+            .and_then(|p| p.rsplit_once('/').map(|(dir, _)| dir.to_owned()))
+            .unwrap_or_else(|| match path {
+                // A path with no slash is a project-root file: group it
+                // under "." so it still mirrors the tree honestly.
+                Some(_) => ".".to_owned(),
+                None => MACRO_DIR_NO_PATH.to_owned(),
+            });
+        let file = path.and_then(|p| p.rsplit('/').next()).map(str::to_owned);
+        by_folder.entry(folder).or_default().push(MacroDirEntry {
+            id: id.as_str().to_owned(),
+            name: leaf_segment(id.as_str()).to_owned(),
+            file,
+        });
+    }
+    by_folder
+        .into_iter()
+        .map(|(folder, entries)| MacroDirFolder { folder, entries })
+        .collect()
+}
+
+/// Build the filtered artifact directory for the focused macro
+/// (cute-dbt#345). `models` is the blast-radius model set (the focus
+/// `users`); `tests` is the [`macro_test_consumers`](crate::domain::macro_test_consumers)
+/// set. Both are grouped into folders independently — the two partitions
+/// never merge (AC3).
+fn build_macro_directory(
+    current: &Manifest,
+    models: &std::collections::BTreeSet<NodeId>,
+    tests: &std::collections::BTreeSet<NodeId>,
+) -> MacroDirectory {
+    let model_folders = macro_dir_partition(current, models);
+    let test_folders = macro_dir_partition(current, tests);
+    let model_count = model_folders.iter().map(|f| f.entries.len()).sum();
+    let test_count = test_folders.iter().map(|f| f.entries.len()).sum();
+    MacroDirectory {
+        models: model_folders,
+        tests: test_folders,
+        model_count,
+        test_count,
+    }
+}
+
 /// The one-line fixture-shape summary for a test row
 /// (`"2 givens, expects 1 row"`).
 fn test_shape(given_count: usize, expect_rows: Option<usize>) -> String {
@@ -1257,14 +1371,15 @@ struct ExploreTestsTemplate<'a> {
 /// askama binding for `templates/explore-macro.html`.
 ///
 /// The third explore sub-page (cute-dbt#345, epic cute-dbt#99). Emitted
-/// only when a `--pr-diff` changed a root-project macro. Slice 3 renders
-/// the focused macro DAG: the [`build_macro_lineage_payload`] carrier (the
-/// `users ∪ downstream` subgraph, role-stamped) driven by the SAME
-/// vendored Cytoscape + cytoscape-dagre core and `explore-lineage.js`
+/// only when a `--pr-diff` changed a root-project macro. Renders the
+/// focused macro DAG (Slice 3): the [`build_macro_lineage_payload`]
+/// carrier (the `users ∪ downstream` subgraph, role-stamped) driven by the
+/// SAME vendored Cytoscape + cytoscape-dagre core and `explore-lineage.js`
 /// engine as `dag.html`, with the macro-callers emphasized and the
-/// downstream closure dimmed-as-context. The filtered model+test
-/// directory (Slice 4) and the legibility banner (Slice 5) land in this
-/// shell later.
+/// downstream closure dimmed-as-context — PLUS the filtered artifact
+/// directory (AC1 + AC3): the folder-grouped model and test partitions of
+/// everything that calls the macro, surfaced separately as collapsible
+/// `<details>` groups below the DAG.
 #[derive(Template)]
 #[template(path = "explore-macro.html", escape = "html")]
 struct ExploreMacroTemplate<'a> {
@@ -1286,6 +1401,10 @@ struct ExploreMacroTemplate<'a> {
     /// carries its `macro_role` (`"user"`/`"downstream"`), the per-role
     /// boot-class hook in `explore-lineage.js`.
     dag_json: &'a str,
+    /// The filtered artifact directory (cute-dbt#345 AC1 + AC3) — the
+    /// folder-grouped model + test partitions of everything that calls the
+    /// focused macro, the two partitions never merged.
+    directory: &'a MacroDirectory,
     /// The macro-caller (`users`) count — the emphasized models.
     user_count: usize,
     /// The downstream-closure count — the dimmed-as-context nodes.
@@ -1366,6 +1485,26 @@ fn explore_models(
         .collect()
 }
 
+/// The resolved macro-view input for `render_explore` (cute-dbt#345) — the
+/// pre-walked domain id sets the macro sub-page renders, bundled so the
+/// renderer never performs a domain walk (the explore-lane pure-renderer
+/// posture).
+///
+/// Both fields are resolved upstream in `cli::execute_explore`:
+/// `focus` from [`macro_focus_set`](crate::domain::macro_focus_set) (the
+/// DAG's `users ∪ downstream`) and `tests` from
+/// [`macro_test_consumers`](crate::domain::macro_test_consumers) (the
+/// directory's tests partition). `focus.users` doubles as the directory's
+/// models partition — one pure-domain authority feeds both surfaces
+/// (cute-dbt#345 AC4).
+pub struct MacroFocus<'a> {
+    /// The focused-DAG node set (`users ∪ downstream`, role-stamped).
+    pub focus: &'a MacroFocusSet,
+    /// The `test`/`unit_test` consumers of the macro — the directory's
+    /// tests partition (kept disjoint from the models partition, AC3).
+    pub tests: &'a std::collections::BTreeSet<NodeId>,
+}
+
 /// Render the explore pages into `out_dir` (created if absent).
 ///
 /// Writes `dag.html` then `tests.html`, and — when `macro_focus` is
@@ -1381,14 +1520,14 @@ fn explore_models(
 /// page. Either way the full `models` set renders — context never
 /// narrows scope.
 ///
-/// `macro_focus` (cute-dbt#345) is the resolved
-/// [`MacroFocusSet`] for the macro a
-/// `--pr-diff` changed: `Some(focus)` renders the focused macro DAG into
-/// `macro.html` (and the third nav anchor on every page); `None` keeps
-/// the two-page output (and its byte-identical goldens) unchanged. The
-/// renderer takes the pre-resolved focus set, not the raw changed-macro
-/// ids — scope resolution (and the domain walk) stays in `cli/mod.rs`, so
-/// this layer is a pure renderer (the explore-lane posture).
+/// `macro_focus` (cute-dbt#345) is the resolved [`MacroFocus`] for the
+/// macro a `--pr-diff` changed: `Some(focus)` renders the focused macro
+/// DAG **and** the filtered artifact directory into `macro.html` (and the
+/// third nav anchor on every page); `None` keeps the two-page output (and
+/// its byte-identical goldens) unchanged. The renderer takes the
+/// pre-resolved domain id sets, not the raw changed-macro ids — scope
+/// resolution (and the domain walk) stays in `cli/mod.rs`, so this layer
+/// is a pure renderer (the explore-lane posture).
 ///
 /// # Errors
 ///
@@ -1400,7 +1539,7 @@ pub fn render_explore(
     models: &ModelInScopeSet,
     changed: Option<&ModelInScopeSet>,
     payload: &ReportPayload,
-    macro_focus: Option<&MacroFocusSet>,
+    macro_focus: Option<MacroFocus<'_>>,
     seed_cards: &[SeedCard],
     seed_row_cap: usize,
 ) -> io::Result<()> {
@@ -1485,10 +1624,13 @@ pub fn render_explore(
     // cute-dbt#345 — the third explore sub-page. Emitted only when the
     // run carried a `--pr-diff` changing a root-project macro; the
     // no-macro path writes just dag.html/tests.html (the goldens' shape).
-    // Slice 3 renders the focused macro DAG: the `users ∪ downstream`
-    // subgraph (role-stamped) through the same vendored Cytoscape +
-    // cytoscape-dagre engine `dag.html` uses.
-    if let Some(focus) = macro_focus {
+    // Renders the focused macro DAG (the `users ∪ downstream` subgraph,
+    // role-stamped, through the same vendored Cytoscape + cytoscape-dagre
+    // engine `dag.html` uses) PLUS the filtered artifact directory — the
+    // folder-grouped model + test partitions of everything that calls the
+    // macro, surfaced separately below the DAG.
+    if let Some(macro_focus) = macro_focus {
+        let focus = macro_focus.focus;
         let macro_lineage = build_macro_lineage_payload(current, focus);
         // The displayed counts must reflect what RENDERS, not the domain
         // closure: `focus.downstream` crosses every consumer node type
@@ -1510,6 +1652,11 @@ pub fn render_explore(
             .count();
         let macro_dag_json = json_for_html_script(&macro_lineage)
             .map_err(|err| io::Error::other(format!("macro dag payload serialization: {err}")))?;
+        // The filtered artifact directory (AC1 + AC3): the models partition
+        // IS the focus set's `users` (the blast radius — one authority,
+        // AC4); the tests partition is the pre-resolved `macro_test_consumers`
+        // set. Both grouped into folders independently, never merged.
+        let directory = build_macro_directory(current, &focus.users, macro_focus.tests);
         let macro_html = ExploreMacroTemplate {
             sakura_css: SAKURA_CSS,
             appearance_js: APPEARANCE_JS,
@@ -1518,6 +1665,7 @@ pub fn render_explore(
             explore_lineage_js: EXPLORE_LINEAGE_JS,
             favicon_data_uri: FAVICON_DATA_URI,
             dag_json: &macro_dag_json,
+            directory: &directory,
             user_count,
             downstream_count,
             edge_count: macro_lineage.edges.len(),
@@ -1533,7 +1681,7 @@ pub fn render_explore(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::collections::{BTreeMap, HashMap as StdHashMap};
+    use std::collections::{BTreeMap, BTreeSet, HashMap as StdHashMap};
 
     use crate::adapters::render::build_payload;
     use crate::domain::{
@@ -3375,6 +3523,7 @@ mod tests {
             &["model.shop.stg_orders"],
             &["model.shop.dim_orders", "model.shop.mart_orders"],
         );
+        let macro_tests = BTreeSet::new();
         let dir = tmp_dir("macro-focus");
         render_explore(
             &dir,
@@ -3382,7 +3531,10 @@ mod tests {
             &models,
             None,
             &payload,
-            Some(&focus),
+            Some(MacroFocus {
+                focus: &focus,
+                tests: &macro_tests,
+            }),
             &[],
             DEFAULT_SEED_ROW_CAP,
         )
@@ -3477,6 +3629,7 @@ mod tests {
         // the over-claim source if counted directly.
         assert_eq!(focus.downstream.len(), 2, "closure includes the test node");
 
+        let macro_tests = BTreeSet::new();
         let dir = tmp_dir("macro-count-vertex");
         render_explore(
             &dir,
@@ -3484,7 +3637,10 @@ mod tests {
             &models,
             None,
             &payload,
-            Some(&focus),
+            Some(MacroFocus {
+                focus: &focus,
+                tests: &macro_tests,
+            }),
             &[],
             DEFAULT_SEED_ROW_CAP,
         )
@@ -3527,6 +3683,186 @@ mod tests {
         let _ = fs::remove_dir_all(&dir);
     }
 
+    // ----- the filtered artifact directory (cute-dbt#345 AC1 + AC3) -----
+
+    /// A node with an `original_file_path` — the directory's grouping key.
+    fn node_with_path(id: &str, resource_type: &str, path: Option<&str>) -> Node {
+        Node::new(
+            NodeId::new(id),
+            resource_type,
+            Checksum::new("sha256", "ck"),
+            Some("select 1".to_owned()),
+            None,
+            DependsOn::default(),
+            path.map(str::to_owned),
+            NodeConfig::default(),
+            None,
+            BTreeMap::new(),
+        )
+    }
+
+    #[test]
+    fn macro_directory_groups_entries_by_folder_path() {
+        // Two models under distinct folders + one under a third: the
+        // partition is folder-sorted, each folder's entries id-sorted, and
+        // the file name is the path's last segment.
+        let current = manifest_of(vec![
+            node_with_path(
+                "model.shop.fct_b",
+                "model",
+                Some("models/marts/core/fct_b.sql"),
+            ),
+            node_with_path(
+                "model.shop.fct_a",
+                "model",
+                Some("models/marts/core/fct_a.sql"),
+            ),
+            node_with_path("model.shop.stg", "model", Some("models/staging/stg.sql")),
+        ]);
+        let ids: std::collections::BTreeSet<NodeId> = [
+            NodeId::new("model.shop.fct_b"),
+            NodeId::new("model.shop.fct_a"),
+            NodeId::new("model.shop.stg"),
+        ]
+        .into_iter()
+        .collect();
+        let folders = macro_dir_partition(&current, &ids);
+        assert_eq!(folders.len(), 2, "two distinct folders");
+        assert_eq!(folders[0].folder, "models/marts/core");
+        // Entries are id-sorted: fct_a before fct_b.
+        assert_eq!(folders[0].entries[0].name, "fct_a");
+        assert_eq!(folders[0].entries[0].file.as_deref(), Some("fct_a.sql"));
+        assert_eq!(folders[0].entries[1].name, "fct_b");
+        assert_eq!(folders[1].folder, "models/staging");
+        assert_eq!(folders[1].entries[0].name, "stg");
+    }
+
+    #[test]
+    fn macro_directory_partitions_models_and_tests_separately() {
+        // The two partitions never merge (AC3): a model and a test that
+        // both reach the macro land in disjoint partitions.
+        let current = manifest_of(vec![
+            node_with_path("model.shop.orders", "model", Some("models/orders.sql")),
+            node_with_path("test.shop.dq_orders", "test", Some("tests/dq_orders.sql")),
+        ]);
+        let models: std::collections::BTreeSet<NodeId> =
+            [NodeId::new("model.shop.orders")].into_iter().collect();
+        let tests: std::collections::BTreeSet<NodeId> =
+            [NodeId::new("test.shop.dq_orders")].into_iter().collect();
+        let dir = build_macro_directory(&current, &models, &tests);
+        assert_eq!(dir.model_count, 1);
+        assert_eq!(dir.test_count, 1);
+        assert_eq!(dir.models[0].entries[0].name, "orders");
+        assert_eq!(dir.tests[0].entries[0].name, "dq_orders");
+        // The model never appears in the tests partition and vice versa.
+        let in_tests = dir
+            .tests
+            .iter()
+            .flat_map(|f| &f.entries)
+            .any(|e| e.id == "model.shop.orders");
+        assert!(
+            !in_tests,
+            "the model must not leak into the tests partition"
+        );
+    }
+
+    #[test]
+    fn macro_directory_surfaces_pathless_nodes_under_a_sentinel() {
+        // A node with no original_file_path (synthetic / pre-1.8) is
+        // surfaced under the "(no path)" bucket, never silently dropped.
+        let current = manifest_of(vec![
+            node_with_path("model.shop.synthetic", "model", None),
+            // A project-root file (no slash) groups under ".".
+            node_with_path("model.shop.root", "model", Some("root.sql")),
+        ]);
+        let ids: std::collections::BTreeSet<NodeId> = [
+            NodeId::new("model.shop.synthetic"),
+            NodeId::new("model.shop.root"),
+        ]
+        .into_iter()
+        .collect();
+        let folders = macro_dir_partition(&current, &ids);
+        let labels: Vec<&str> = folders.iter().map(|f| f.folder.as_str()).collect();
+        assert!(
+            labels.contains(&MACRO_DIR_NO_PATH),
+            "pathless node bucket: {labels:?}"
+        );
+        assert!(labels.contains(&"."), "root-file bucket: {labels:?}");
+        // The pathless entry carries no file name.
+        let no_path = folders
+            .iter()
+            .find(|f| f.folder == MACRO_DIR_NO_PATH)
+            .expect("the no-path folder");
+        assert_eq!(no_path.entries[0].file, None);
+    }
+
+    #[test]
+    fn macro_directory_is_empty_for_empty_id_sets() {
+        let current = manifest_of(vec![node_with_path(
+            "model.shop.orders",
+            "model",
+            Some("models/orders.sql"),
+        )]);
+        let empty = std::collections::BTreeSet::new();
+        let dir = build_macro_directory(&current, &empty, &empty);
+        assert_eq!(dir.model_count, 0);
+        assert_eq!(dir.test_count, 0);
+        assert!(dir.models.is_empty() && dir.tests.is_empty());
+    }
+
+    #[test]
+    fn render_explore_macro_page_renders_the_filtered_directory() {
+        // End-to-end render assertion: a focus set with a user model + a
+        // test consumer renders BOTH partitions into macro.html with the
+        // folder grouping and the partition headers.
+        let current = manifest_of(vec![
+            node_with_path(
+                "model.shop.stg_orders",
+                "model",
+                Some("models/staging/stg_orders.sql"),
+            ),
+            node_with_path("test.shop.dq_orders", "test", Some("tests/dq_orders.sql")),
+        ]);
+        let models = all_models(&current);
+        let payload = payload_for(&current, &models);
+        let focus = focus_of(&["model.shop.stg_orders"], &[]);
+        let macro_tests: std::collections::BTreeSet<NodeId> =
+            [NodeId::new("test.shop.dq_orders")].into_iter().collect();
+        let dir = tmp_dir("macro-directory");
+        render_explore(
+            &dir,
+            &current,
+            &models,
+            None,
+            &payload,
+            Some(MacroFocus {
+                focus: &focus,
+                tests: &macro_tests,
+            }),
+            &[],
+            DEFAULT_SEED_ROW_CAP,
+        )
+        .expect("explore renders");
+        let macro_html = fs::read_to_string(dir.join("macro.html")).expect("macro.html");
+        assert!(
+            macro_html.contains("class=\"macro-directory\""),
+            "macro.html renders the filtered artifact directory",
+        );
+        assert!(
+            macro_html.contains("<summary>models/staging</summary>"),
+            "the models partition groups the caller under its folder: {macro_html}",
+        );
+        assert!(
+            macro_html.contains("<summary>tests</summary>"),
+            "the tests partition groups the test consumer under its folder",
+        );
+        assert!(
+            macro_html.contains(">stg_orders</span>") && macro_html.contains(">dq_orders</span>"),
+            "both the model caller and the test consumer render as entries",
+        );
+        let _ = fs::remove_dir_all(&dir);
+    }
+
     #[test]
     fn render_explore_without_context_renders_no_change_chrome() {
         // The no-flag page: no legend chip, no header clause — the
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index e01dfc4c..22b95cb0 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -79,7 +79,7 @@ use std::process::ExitCode;
 
 use clap::Parser;
 
-use crate::adapters::explore::render_explore;
+use crate::adapters::explore::{MacroFocus, render_explore};
 use crate::adapters::findings_emit::{
     collect_in_scope_findings, envelope_from_findings_anchored, write_sidecar,
 };
@@ -106,12 +106,12 @@ use crate::domain::{
     changed_macros_baseline, changed_macros_pr_diff, changed_models, check_by_id, compute_pr_dag,
     diff_project_definitions, effective_fixture_format, external_fixture_table,
     extract_model_block, extract_unit_test_block, gather_governance, has_total_uncovered,
-    hook_operations, macro_focus_set, populate_line_counts, pr_dag_lines_from_diff,
-    pr_dag_lines_from_raw_code, preflight_compiled, raw_hunk_lines, reconstruct_block_diffs,
-    reconstruct_external_fixture_diff, reconstruct_model_sql_diffs, reconstruct_table_diffs,
-    refine_changed_by_hunks, resolve_check_policy, resolve_experimental_config,
-    resolve_finding_anchor, reverse_apply, scan_pragmas, select_in_scope, select_seeds_in_scope,
-    widen_with_config_attributions,
+    hook_operations, macro_focus_set, macro_test_consumers, populate_line_counts,
+    pr_dag_lines_from_diff, pr_dag_lines_from_raw_code, preflight_compiled, raw_hunk_lines,
+    reconstruct_block_diffs, reconstruct_external_fixture_diff, reconstruct_model_sql_diffs,
+    reconstruct_table_diffs, refine_changed_by_hunks, resolve_check_policy,
+    resolve_experimental_config, resolve_finding_anchor, reverse_apply, scan_pragmas,
+    select_in_scope, select_seeds_in_scope, widen_with_config_attributions,
 };
 use crate::ports::{ManifestSource, ProjectFileReader};
 
@@ -726,17 +726,23 @@ fn execute_explore(args: &ExploreArgs) -> Result<(), RunError> {
         "",
     );
     // cute-dbt#345 — the macro view emits its third sub-page only when the
-    // `--pr-diff` changed a root-project macro. The FOCUS SET is RESOLVED
-    // here (the scope-resolution lane, including the domain walk) and
-    // handed to the renderer, which stays a pure renderer (it never calls
-    // a domain walker). When several macros changed, the focused DAG is
-    // built for the lowest-id one (the deterministic `BTreeSet` first) —
-    // the multi-macro picker is a later slice (founder Open Q 6).
-    let macro_focus = context
-        .changed_macros
-        .iter()
-        .next()
-        .map(|macro_id| macro_focus_set(&current, macro_id));
+    // `--pr-diff` changed a root-project macro. The FOCUS SET and the TEST
+    // CONSUMERS are RESOLVED here (the scope-resolution lane, including the
+    // domain walks) and handed to the renderer, which stays a pure renderer
+    // (it never calls a domain walker). When several macros changed, the
+    // focused view is built for the lowest-id one (the deterministic
+    // `BTreeSet` first) — the multi-macro picker is a later slice (founder
+    // Open Q 6).
+    let changed_macro = context.changed_macros.iter().next();
+    let macro_focus = changed_macro.map(|macro_id| macro_focus_set(&current, macro_id));
+    // The filtered artifact directory's tests partition (cute-dbt#345 AC3):
+    // the `test`/`unit_test` consumers of the macro, resolved by the SAME
+    // pure-domain authority the model partition uses (`macro_test_consumers`
+    // twins `macro_blast_radius`). Empty default when no macro changed; the
+    // renderer only consumes it on the `Some(macro_focus)` arm.
+    let macro_tests = changed_macro
+        .map(|macro_id| macro_test_consumers(&current, macro_id))
+        .unwrap_or_default();
     // cute-dbt#398 — the seed-node detail card's data: every seed's
     // working-tree CSV (read via `--project-root`, present only on the
     // `--pr-diff` arm), capped to DEFAULT_SEED_ROW_CAP (explore has no
@@ -750,7 +756,10 @@ fn execute_explore(args: &ExploreArgs) -> Result<(), RunError> {
         &models,
         context.changed_models.as_ref(),
         &payload,
-        macro_focus.as_ref(),
+        macro_focus.as_ref().map(|focus| MacroFocus {
+            focus,
+            tests: &macro_tests,
+        }),
         &seed_cards,
         DEFAULT_SEED_ROW_CAP,
     )
diff --git a/src/domain/macro_lens.rs b/src/domain/macro_lens.rs
index 40a4dbbe..98e7634d 100644
--- a/src/domain/macro_lens.rs
+++ b/src/domain/macro_lens.rs
@@ -84,24 +84,71 @@ use crate::domain::pr_diff::NormalizedDiffIndex;
 /// models).
 #[must_use]
 pub fn macro_blast_radius(manifest: &Manifest, changed_macro_id: &str) -> BTreeSet<NodeId> {
+    // Models only — the `model` resource-type partition (the module-doc's
+    // first mandatory filter). The shared walk does the root-project gate
+    // and the transitive reachability.
+    macro_resource_consumers(manifest, changed_macro_id, |rt| rt == "model")
+}
+
+/// Every root-project **test** node (`resource_type ∈ {"test",
+/// "unit_test"}`) whose `depends_on.macros` transitive closure contains
+/// the changed macro `changed_macro_id` (**M**) — the cute-dbt#345 *tests*
+/// partition of the explore macro directory.
+///
+/// The deliberate twin of [`macro_blast_radius`]: same transitive walk
+/// (forward BFS over [`Manifest::macro_refs`], cycle-guarded) and same
+/// root-project fail-open package filter, differing ONLY in the
+/// resource-type predicate. The shaping (`get_where_subquery`-style
+/// pollution) makes the partition mandatory: surfacing the test consumers
+/// **separately** keeps them from flooding the model view. Generic
+/// schema-test macros (`macro.dbt.get_where_subquery`, the `dbt_expectations`
+/// `test_*` helpers) live in the `dbt`/`dbt_expectations` packages, not the
+/// root project, so a root-project macro M (the only thing the lens
+/// focuses on) typically reaches **only** the handful of singular/generic
+/// tests that genuinely call it — an honest, scoped set.
+///
+/// Returns node ids in deterministic id order ([`BTreeSet`]); an unknown
+/// macro yields an empty set (fail-open, same as the model partition).
+#[must_use]
+pub fn macro_test_consumers(manifest: &Manifest, changed_macro_id: &str) -> BTreeSet<NodeId> {
+    macro_resource_consumers(manifest, changed_macro_id, |rt| {
+        rt == "test" || rt == "unit_test"
+    })
+}
+
+/// The shared reverse-macro reachability walk behind both
+/// [`macro_blast_radius`] (models) and [`macro_test_consumers`] (tests) —
+/// the ONE pure-domain authority (cute-dbt#345 AC4). Returns every
+/// root-project node whose `resource_type` satisfies `accept` and whose
+/// `depends_on.macros` transitive closure contains `changed_macro_id`.
+///
+/// `accept` is the only axis the two callers differ on; the root-project
+/// fail-open package filter (cute-dbt#366) and the cycle-guarded forward
+/// BFS over [`Manifest::macro_refs`] are shared so the two partitions can
+/// never drift on the transitive-reachability semantics.
+fn macro_resource_consumers(
+    manifest: &Manifest,
+    changed_macro_id: &str,
+    accept: impl Fn(&str) -> bool,
+) -> BTreeSet<NodeId> {
     let Some(project) = manifest.metadata().project_name() else {
         // No root project name ⇒ the root-project filter cannot pass for
-        // any model. Fail-open empty rather than leaking vendor models.
+        // any node. Fail-open empty rather than leaking vendor nodes.
         return BTreeSet::new();
     };
     // Memo: macro id → does its forward closure reach M? Shared across
-    // every model's walk so each macro body is visited at most once.
+    // every node's walk so each macro body is visited at most once.
     let mut reaches: HashMap<String, bool> = HashMap::new();
     manifest
         .nodes()
         .iter()
-        .filter(|(_, node)| node.resource_type() == "model")
-        // Fail-open on a null/unset package: a root-project model whose
+        .filter(|(_, node)| accept(node.resource_type()))
+        // Fail-open on a null/unset package: a root-project node whose
         // package fusion left unset must still surface — only a *vendor*
         // package (`Some(other)`) is dropped. Mirrors the macro-side
         // `is_root_project_macro` fail-open so both filters for this feature
         // share null-package semantics; strict `== Some(project)` would
-        // under-claim the blast radius (cute-dbt#366).
+        // under-claim the radius (cute-dbt#366).
         .filter(|(_, node)| node.package_name().is_none_or(|pkg| pkg == project))
         .filter(|(_, node)| {
             direct_set_reaches(
@@ -494,6 +541,45 @@ mod tests {
         .with_identity(None, Some(PROJECT.to_owned()))
     }
 
+    /// A `test`-typed node carrying macro deps in a NAMED package (the
+    /// vendor-test exclusion case for the tests partition).
+    fn test_node_in_pkg(full_id: &str, direct_macros: &[&str], pkg: &str) -> Node {
+        let macros = direct_macros.iter().map(|m| (*m).to_owned()).collect();
+        Node::new(
+            NodeId::new(full_id),
+            "test",
+            Checksum::new("sha256", "abc"),
+            None,
+            None,
+            DependsOn::new(macros, vec![]),
+            None,
+            NodeConfig::default(),
+            None,
+            BTreeMap::new(),
+        )
+        .with_identity(None, Some(pkg.to_owned()))
+    }
+
+    /// A `test`-typed node carrying macro deps with an UNSET package
+    /// (`None`, the fusion-degraded shape) — the fail-open case for the
+    /// tests partition.
+    fn test_node_null_pkg(full_id: &str, direct_macros: &[&str]) -> Node {
+        let macros = direct_macros.iter().map(|m| (*m).to_owned()).collect();
+        Node::new(
+            NodeId::new(full_id),
+            "test",
+            Checksum::new("sha256", "abc"),
+            None,
+            None,
+            DependsOn::new(macros, vec![]),
+            None,
+            NodeConfig::default(),
+            None,
+            BTreeMap::new(),
+        )
+        .with_identity(None, None)
+    }
+
     /// Build a manifest with the given nodes + macro→macro reference edges.
     fn manifest_with(
         nodes: Vec<Node>,
@@ -748,6 +834,162 @@ mod tests {
         assert!(radius.contains(&id("model.shop.orders")));
     }
 
+    // ----- macro_test_consumers (cute-dbt#345 — the tests partition) ----
+    //
+    // The deliberate twin of macro_blast_radius: same transitive walk +
+    // root-project filter, accepting `test`/`unit_test` resource types
+    // instead of `model`. The two partitions are disjoint by resource type
+    // (a node is never both a model and a test), which is the whole point
+    // of surfacing them separately (the get_where_subquery pollution guard).
+
+    #[test]
+    fn test_consumers_includes_a_direct_test_caller() {
+        // A generic/singular test node that calls the root macro directly
+        // surfaces in the tests partition — the symmetric case to the
+        // model partition's direct caller.
+        let m = manifest_with(
+            vec![
+                typed_node_with_macros(
+                    "test.shop.dq_orders.abc",
+                    "test",
+                    &["macro.shop.add_dq_flags"],
+                ),
+                model_with_macros("model.shop.orders", &["macro.shop.add_dq_flags"]),
+            ],
+            &[],
+            &[],
+        );
+        let tests = macro_test_consumers(&m, "macro.shop.add_dq_flags");
+        assert_eq!(
+            tests.len(),
+            1,
+            "only the test node surfaces, never the model"
+        );
+        assert!(tests.contains(&id("test.shop.dq_orders.abc")));
+    }
+
+    #[test]
+    fn test_consumers_accepts_unit_test_resource_type() {
+        // `unit_test` nodes are tests too (a different resource_type) — the
+        // partition accepts both `test` and `unit_test`.
+        let m = manifest_with(
+            vec![typed_node_with_macros(
+                "unit_test.shop.ut_orders",
+                "unit_test",
+                &["macro.shop.add_dq_flags"],
+            )],
+            &[],
+            &[],
+        );
+        let tests = macro_test_consumers(&m, "macro.shop.add_dq_flags");
+        assert!(tests.contains(&id("unit_test.shop.ut_orders")));
+    }
+
+    #[test]
+    fn test_consumers_includes_a_test_reaching_m_only_transitively() {
+        // The same transitive channel the model partition walks: a test
+        // node that reaches M only via an intermediate macro must surface,
+        // proving the tests partition shares the ONE reachability authority.
+        let m = manifest_with(
+            vec![typed_node_with_macros(
+                "test.shop.dq_orders.abc",
+                "test",
+                &["macro.shop.is_incremental"],
+            )],
+            &[(
+                "macro.shop.is_incremental",
+                &["macro.shop.should_full_refresh"],
+            )],
+            &[
+                (
+                    "macro.shop.is_incremental",
+                    "{% macro is_incremental() %}{% endmacro %}",
+                ),
+                (
+                    "macro.shop.should_full_refresh",
+                    "{% macro should_full_refresh() %}{% endmacro %}",
+                ),
+            ],
+        );
+        let tests = macro_test_consumers(&m, "macro.shop.should_full_refresh");
+        assert!(
+            tests.contains(&id("test.shop.dq_orders.abc")),
+            "a test reaching M only transitively must surface (shared walk)",
+        );
+    }
+
+    #[test]
+    fn test_consumers_excludes_models_and_vendor_tests() {
+        // The partition is tests-only AND root-project-only: a model caller
+        // never appears here (that's the model partition), and a vendor-
+        // package test (the dbt/dbt_expectations get_where_subquery family)
+        // is dropped.
+        let m = manifest_with(
+            vec![
+                model_with_macros("model.shop.orders", &["macro.shop.add_dq_flags"]),
+                typed_node_with_macros(
+                    "test.shop.dq_orders.abc",
+                    "test",
+                    &["macro.shop.add_dq_flags"],
+                ),
+                test_node_in_pkg(
+                    "test.dbt.where_filter.def",
+                    &["macro.shop.add_dq_flags"],
+                    "dbt",
+                ),
+            ],
+            &[],
+            &[],
+        );
+        let tests = macro_test_consumers(&m, "macro.shop.add_dq_flags");
+        assert_eq!(
+            tests.len(),
+            1,
+            "only the root-project test surfaces; the model and the vendor test do not"
+        );
+        assert!(tests.contains(&id("test.shop.dq_orders.abc")));
+    }
+
+    #[test]
+    fn test_consumers_includes_a_null_package_root_project_test() {
+        // The fail-open package semantics carry to the tests partition: a
+        // test whose package fusion left unset surfaces; a vendor one does
+        // not (mirrors the model partition's null-package test).
+        let m = manifest_with(
+            vec![
+                test_node_null_pkg("test.shop.dq_orders.abc", &["macro.shop.add_dq_flags"]),
+                test_node_in_pkg(
+                    "test.dbt.where_filter.def",
+                    &["macro.shop.add_dq_flags"],
+                    "dbt",
+                ),
+            ],
+            &[],
+            &[],
+        );
+        let tests = macro_test_consumers(&m, "macro.shop.add_dq_flags");
+        assert_eq!(
+            tests.len(),
+            1,
+            "the null-package root-project test surfaces"
+        );
+        assert!(tests.contains(&id("test.shop.dq_orders.abc")));
+    }
+
+    #[test]
+    fn test_consumers_unknown_macro_is_empty() {
+        let m = manifest_with(
+            vec![typed_node_with_macros(
+                "test.shop.dq_orders.abc",
+                "test",
+                &["macro.shop.add_dq_flags"],
+            )],
+            &[],
+            &[],
+        );
+        assert!(macro_test_consumers(&m, "macro.shop.nonexistent").is_empty());
+    }
+
     #[test]
     fn blast_radius_excludes_non_root_project_models() {
         // A vendor-package model that calls a root-project macro is not the
diff --git a/src/domain/mod.rs b/src/domain/mod.rs
index 4f4c8c53..fd6bbe27 100644
--- a/src/domain/mod.rs
+++ b/src/domain/mod.rs
@@ -103,7 +103,7 @@ pub use governance::{
 pub use grain::{GrainKind, GrainSignal, model_grain_signals, test_is_enabled};
 pub use macro_lens::{
     MacroFocusSet, changed_macros_baseline, changed_macros_pr_diff, macro_blast_radius,
-    macro_focus_set,
+    macro_focus_set, macro_test_consumers,
 };
 pub use manifest::{
     Checksum, ColumnFacts, Constraint, ConstraintKind, DependsOn, DisabledEntry, Exposure, Group,
diff --git a/templates/explore-macro.html b/templates/explore-macro.html
index 98c047c9..e6abdd29 100644
--- a/templates/explore-macro.html
+++ b/templates/explore-macro.html
@@ -86,6 +86,25 @@
 .model-detail-card .detail-type { display: inline-block; margin-right: 0.35rem; padding: 0 0.4rem; border: 1.5px solid var(--dag-import-stroke); border-radius: 4px; color: var(--dag-node-text); font-size: 0.8rem; }
 .model-detail-card .detail-changed { display: inline-block; margin-left: 0.35rem; padding: 0 0.4rem; border: 1.5px solid var(--dag-import-stroke); border-radius: 4px; background: var(--dag-import-fill); color: var(--dag-node-text); box-shadow: 0 0 0 2px rgba(230, 159, 0, 0.55); font-size: 0.8rem; }
 .model-detail-card .detail-section-title { margin: 0.5rem 0 0.15rem; font-size: 0.85rem; color: var(--text-muted); font-weight: 600; text-transform: uppercase; letter-spacing: 0.03em; }
+/* cute-dbt#345 (AC1 + AC3) — the filtered artifact directory: the
+   folder-grouped models + tests that call the macro, surfaced as TWO
+   separate partitions (the get_where_subquery non-merge rule). Native
+   <details>/<summary> collapse (zero JS, zero egress); themed via the
+   shared semantic tokens. */
+.macro-directory { margin-top: 1.25rem; }
+.macro-directory > h2 { margin-bottom: 0.25rem; }
+.macro-directory-hint { color: var(--text-muted); font-size: 0.85rem; margin: 0 0 0.75rem; }
+.macro-partition { border: 1px solid var(--border); border-radius: 6px; background: var(--surface); padding: 0.5rem 0.85rem 0.75rem; margin-bottom: 0.75rem; }
+.macro-partition > h3 { font-size: 1rem; margin: 0.25rem 0 0.1rem; }
+.macro-partition-count { color: var(--text-muted); font-weight: 400; font-size: 0.85rem; }
+.macro-partition-empty { color: var(--text-faint); font-style: italic; font-size: 0.9rem; margin: 0.3rem 0 0; }
+.macro-folder { margin: 0.35rem 0 0; }
+.macro-folder > summary { cursor: pointer; font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-size: 0.85rem; color: var(--text-muted); padding: 0.1rem 0; }
+.macro-folder > summary:hover, .macro-folder > summary:focus { color: var(--text); }
+.macro-folder-files { list-style: none; margin: 0.2rem 0 0.3rem; padding-left: 1.2rem; }
+.macro-folder-files li { margin: 0.1rem 0; font-size: 0.9rem; overflow-wrap: anywhere; }
+.macro-entry-name { font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; font-weight: 600; }
+.macro-entry-file { color: var(--text-muted); font-size: 0.85rem; }
 </style>
 </head>
 <body>
@@ -136,6 +155,46 @@ <h1>Macro focus</h1>
   <aside class="model-detail-card" aria-label="Model detail" hidden></aside>
 </section>
 
+{# cute-dbt#345 (AC1 + AC3) — the filtered artifact directory: only the
+   models + tests whose transitive depends_on.macros reaches the focused
+   macro, mirroring the project folders. The two partitions render
+   SEPARATELY (never merged) so the get_where_subquery-style test
+   consumers cannot flood the model view. Collapsible via native
+   <details>/<summary> — no JS, no egress. The model partition IS the
+   focus set's `users` (the blast radius), the test partition is the
+   macro_test_consumers set; both grouped by the directory portion of
+   each member's original_file_path. #}
+<section class="macro-directory" aria-label="Filtered artifact directory">
+  <h2>What calls this macro</h2>
+  <p class="macro-directory-hint">Only the models and tests whose <code>depends_on.macros</code> reaches the macro &mdash; grouped by project folder, the two kinds kept separate.</p>
+
+  <div class="macro-partition" aria-label="Models that call the macro">
+    <h3>Models <span class="macro-partition-count">({{ directory.model_count }})</span></h3>
+    {% if directory.models.is_empty() %}<p class="macro-partition-empty">No root-project models call this macro.</p>
+    {% else %}{% for folder in directory.models %}<details class="macro-folder" open>
+      <summary>{{ folder.folder }}</summary>
+      <ul class="macro-folder-files">
+        {% for entry in folder.entries %}<li data-node-id="{{ entry.id }}"><span class="macro-entry-name">{{ entry.name }}</span>{% match entry.file %}{% when Some with (f) %} <span class="macro-entry-file">{{ f }}</span>{% when None %}{% endmatch %}</li>
+        {% endfor %}
+      </ul>
+    </details>
+    {% endfor %}{% endif %}
+  </div>
+
+  <div class="macro-partition" aria-label="Tests that call the macro">
+    <h3>Tests <span class="macro-partition-count">({{ directory.test_count }})</span></h3>
+    {% if directory.tests.is_empty() %}<p class="macro-partition-empty">No root-project tests call this macro.</p>
+    {% else %}{% for folder in directory.tests %}<details class="macro-folder" open>
+      <summary>{{ folder.folder }}</summary>
+      <ul class="macro-folder-files">
+        {% for entry in folder.entries %}<li data-node-id="{{ entry.id }}"><span class="macro-entry-name">{{ entry.name }}</span>{% match entry.file %}{% when Some with (f) %} <span class="macro-entry-file">{{ f }}</span>{% when None %}{% endmatch %}</li>
+        {% endfor %}
+      </ul>
+    </details>
+    {% endfor %}{% endif %}
+  </div>
+</section>
+
 {# cute-dbt#101 — the focused lineage carrier. The SAME `explore-dag-data`
    element id explore-lineage.js reads, so the engine boots over the
    focused payload verbatim; each node additionally carries its
diff --git a/tests/headless_toggle.rs b/tests/headless_toggle.rs
index 90eefb42..bd6b4abf 100644
--- a/tests/headless_toggle.rs
+++ b/tests/headless_toggle.rs
@@ -7264,6 +7264,67 @@ fn explore_macro_dag_rendered_geometry_is_structurally_sound() {
     let _ = tab.close(true);
 }
 
+#[test]
+#[ignore = "requires Chrome; runs explicitly in the headless-zero-egress CI job via `-- --ignored`"]
+fn explore_macro_page_renders_the_filtered_artifact_directory() {
+    // cute-dbt#345 (AC1 + AC3) — the filtered artifact directory: the
+    // committed focused-macro golden (`explore-macro/macro.html`) lists the
+    // models that call the macro (`quarantine_filter`), grouped by project
+    // folder via native <details>/<summary>, with the tests partition kept
+    // SEPARATE (the get_where_subquery non-merge rule). This drives a real
+    // Chromium against the committed golden and asserts the live DOM the
+    // browser actually rendered (a structural assert beyond the byte-gate).
+    let browser = launch_browser();
+    let url = committed_example_url("explore-macro/macro.html");
+    let tab = browser.new_tab().expect("new tab");
+    tab.navigate_to(&url).expect("navigate");
+    tab.wait_until_navigated().expect("await navigation");
+    tab.wait_for_element_with_custom_timeout(
+        ".macro-directory",
+        std::time::Duration::from_secs(15),
+    )
+    .expect("the filtered artifact directory renders");
+
+    // Two SEPARATE partitions exist (never merged).
+    assert!(
+        eval_bool(
+            &tab,
+            "document.querySelectorAll('.macro-directory .macro-partition').length === 2",
+        ),
+        "the directory surfaces the models and tests partitions separately",
+    );
+
+    // The models partition lists the macro callers under their project
+    // folders (the playground golden has 3 callers across 2 folders).
+    let model_entries = eval_i64(
+        &tab,
+        "document.querySelectorAll('.macro-partition[aria-label=\"Models that call the macro\"] .macro-folder-files li').length",
+    );
+    assert!(
+        model_entries >= 3,
+        "the models partition lists every macro caller as a directory entry (got {model_entries})",
+    );
+
+    // The folders are collapsible <details> with a folder-path summary.
+    assert!(
+        eval_bool(
+            &tab,
+            "Array.from(document.querySelectorAll('.macro-partition[aria-label=\"Models that call the macro\"] details.macro-folder > summary')).some(function(s){return s.textContent.indexOf('models/') === 0;})",
+        ),
+        "the model folders carry a collapsible project-folder summary",
+    );
+
+    // Collapse a folder (native <details>) and confirm it closes — the
+    // collapsibility is real, not decorative.
+    let collapsed = eval_bool(
+        &tab,
+        "(function(){var d=document.querySelector('.macro-partition[aria-label=\"Models that call the macro\"] details.macro-folder');if(!d){return false;}d.open=false;return d.open===false;})()",
+    );
+    assert!(collapsed, "the directory folders are genuinely collapsible");
+
+    let _ = tab.close(true);
+}
+
 #[test]
 #[ignore = "requires Chrome; runs explicitly in the headless-zero-egress CI job via `-- --ignored`"]
 fn explore_seed_node_detail_card_shows_the_seed_data_table() {
diff --git a/tests/headless_zero_egress.rs b/tests/headless_zero_egress.rs
index bd9c9acf..49372c54 100644
--- a/tests/headless_zero_egress.rs
+++ b/tests/headless_zero_egress.rs
@@ -59,7 +59,7 @@ use headless_chrome::browser::tab::point::Point;
 use headless_chrome::protocol::cdp::types::Event;
 use headless_chrome::protocol::cdp::{Network, Runtime};
 
-use cute_dbt::adapters::explore::render_explore;
+use cute_dbt::adapters::explore::{MacroFocus, render_explore};
 use cute_dbt::adapters::render::build_payload;
 use cute_dbt::domain::{
     Checksum, DEFAULT_SEED_ROW_CAP, DependsOn, Exposure, InScopeSet, Manifest, ManifestMetadata,
@@ -1829,6 +1829,11 @@ fn render_explore_macro_page(
         users: users.iter().map(|s| NodeId::new(*s)).collect(),
         downstream: downstream.iter().map(|s| NodeId::new(*s)).collect(),
     };
+    // cute-dbt#345 — the headless render-path helper threads no test
+    // consumers (the focused-DAG zero-egress arm exercises the lineage
+    // engine, not the directory); the empty set renders an honest empty
+    // tests partition.
+    let macro_tests = std::collections::BTreeSet::new();
     let dir = PathBuf::from(env!("CARGO_TARGET_TMPDIR")).join(stem);
     let _ = std::fs::remove_dir_all(&dir);
     render_explore(
@@ -1837,7 +1842,10 @@ fn render_explore_macro_page(
         &models,
         None,
         &payload,
-        Some(&focus),
+        Some(MacroFocus {
+            focus: &focus,
+            tests: &macro_tests,
+        }),
         &[],
         DEFAULT_SEED_ROW_CAP,
     )
diff --git a/tests/steps/explore_macro_view.rs b/tests/steps/explore_macro_view.rs
index 1a16626b..f083e5a5 100644
--- a/tests/steps/explore_macro_view.rs
+++ b/tests/steps/explore_macro_view.rs
@@ -179,14 +179,59 @@ fn macro_node_count(world: &mut World, expected: usize) {
     );
 }
 
+// --- Then: the filtered artifact directory (cute-dbt#345 AC1 + AC3) ----
+
+#[then("macro.html renders the filtered artifact directory")]
+fn macro_renders_directory(world: &mut World) {
+    let html = macro_html(world);
+    assert!(
+        html.contains(r#"class="macro-directory""#),
+        "macro.html must render the filtered artifact directory section",
+    );
+    // The two partitions are surfaced separately (the AC3 non-merge rule).
+    assert!(
+        html.contains(r#"aria-label="Models that call the macro""#)
+            && html.contains(r#"aria-label="Tests that call the macro""#),
+        "the directory must surface the models and tests partitions separately",
+    );
+}
+
+#[then(regex = r#"^the macro directory models partition lists "([^"]+)" under "([^"]+)"$"#)]
+fn macro_directory_lists_model(world: &mut World, model: String, folder: String) {
+    let html = macro_html(world);
+    let id = format!("model.jaffle_shop.{model}");
+    assert!(
+        html.contains(&format!("<summary>{folder}</summary>")),
+        "the models partition must group the caller under {folder:?}",
+    );
+    assert!(
+        html.contains(&format!(r#"data-node-id="{id}""#)),
+        "the models partition must list {model:?} (id {id}) as a directory entry",
+    );
+}
+
+#[then("the macro directory tests partition is empty")]
+fn macro_directory_tests_empty(world: &mut World) {
+    let html = macro_html(world);
+    assert!(
+        html.contains("No root-project tests call this macro."),
+        "the tests partition must render its honest empty state when no test calls the macro",
+    );
+}
+
+/// The captured `macro.html`, panicking with stderr context when absent.
+fn macro_html(world: &World) -> String {
+    world
+        .explore_macro_html
+        .clone()
+        .unwrap_or_else(|| panic!("macro.html was not written; stderr={}", world.last_stderr))
+}
+
 /// Parse the `explore-dag-data` JSON carrier embedded in `macro.html`
 /// (the focused [`LineagePayload`]). Self-contained on the `World`'s
 /// captured `macro.html` (the subprocess wrote it).
 fn macro_lineage_payload(world: &World) -> serde_json::Value {
-    let html = world
-        .explore_macro_html
-        .clone()
-        .unwrap_or_else(|| panic!("macro.html was not written; stderr={}", world.last_stderr));
+    let html = macro_html(world);
     let dom = tl::parse(&html, tl::ParserOptions::default()).expect("macro.html must parse");
     let parser = dom.parser();
     let node = dom

From a5f9b02ddbb66b9e3136dfee55de5ce6415bf291 Mon Sep 17 00:00:00 2001
From: Christopher Bays <cmbays91@gmail.com>
Date: Sun, 14 Jun 2026 12:29:03 -0400
Subject: [PATCH 2/2] =?UTF-8?q?refactor(explore):=20#345=20=E2=80=94=20sin?=
 =?UTF-8?q?gle-pass=20folder/file=20split=20in=20macro=5Fdir=5Fpartition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compute (folder, file) in one match over original_file_path instead of
three redundant path traversals. Functionally identical (golden output
byte-unchanged); idiomatic single pass.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 src/adapters/explore.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/adapters/explore.rs b/src/adapters/explore.rs
index bac00efc..83d9ac83 100644
--- a/src/adapters/explore.rs
+++ b/src/adapters/explore.rs
@@ -1200,15 +1200,15 @@ fn macro_dir_partition(
             continue;
         };
         let path = node.original_file_path();
-        let folder = path
-            .and_then(|p| p.rsplit_once('/').map(|(dir, _)| dir.to_owned()))
-            .unwrap_or_else(|| match path {
+        let (folder, file) = match path {
+            Some(p) => p.rsplit_once('/').map_or_else(
                 // A path with no slash is a project-root file: group it
                 // under "." so it still mirrors the tree honestly.
-                Some(_) => ".".to_owned(),
-                None => MACRO_DIR_NO_PATH.to_owned(),
-            });
-        let file = path.and_then(|p| p.rsplit('/').next()).map(str::to_owned);
+                || (".".to_owned(), Some(p.to_owned())),
+                |(dir, file_name)| (dir.to_owned(), Some(file_name.to_owned())),
+            ),
+            None => (MACRO_DIR_NO_PATH.to_owned(), None),
+        };
         by_folder.entry(folder).or_default().push(MacroDirEntry {
             id: id.as_str().to_owned(),
             name: leaf_segment(id.as_str()).to_owned(),