@@ -106,6 +106,7 @@ class _TransitiveBudget:
106106class _CachedTransitiveResult :
107107 filtered_findings : list [Finding ]
108108 findings : list [Finding ]
109+ llm_call_log : list [dict [str , object ]]
109110 components : list [str ]
110111 component_metadata : list [dict [str , object ]]
111112 file_cache : dict [str , str ]
@@ -128,25 +129,36 @@ def note_truncation(self, reason: str) -> None:
128129 self .truncation_reasons .append (reason )
129130
130131 def can_scan_more (self ) -> bool :
132+ if self .truncation_reasons :
133+ return False
131134 if self .scanned_targets >= self .budget .max_targets :
132135 self .note_truncation (f"target budget { self .budget .max_targets } reached" )
133136 return False
134- if self .scanned_bytes >= self . budget . max_bytes :
137+ if self .remaining_bytes () <= 0 :
135138 self .note_truncation (f"byte budget { self .budget .max_bytes } reached" )
136139 return False
137- if monotonic () - self . started_at >= self . budget . max_seconds :
140+ if self . remaining_seconds () <= 0 :
138141 self .note_truncation (f"time budget { self .budget .max_seconds :.0f} s reached" )
139142 return False
140143 return True
141144
142145 def record_scan (self , bytes_scanned : int ) -> None :
143146 self .scanned_targets += 1
144- self .scanned_bytes += max ( 0 , bytes_scanned )
145- if self .scanned_bytes >= self . budget . max_bytes :
147+ self .record_bytes ( bytes_scanned )
148+ if self .remaining_bytes () <= 0 :
146149 self .note_truncation (f"byte budget { self .budget .max_bytes } reached" )
147- if monotonic () - self . started_at >= self . budget . max_seconds :
150+ if self . remaining_seconds () <= 0 :
148151 self .note_truncation (f"time budget { self .budget .max_seconds :.0f} s reached" )
149152
153+ def record_bytes (self , bytes_scanned : int ) -> None :
154+ self .scanned_bytes += max (0 , bytes_scanned )
155+
156+ def remaining_seconds (self ) -> float :
157+ return max (0.0 , self .budget .max_seconds - (monotonic () - self .started_at ))
158+
159+ def remaining_bytes (self ) -> int :
160+ return max (0 , self .budget .max_bytes - self .scanned_bytes )
161+
150162
151163def version_callback (value : bool ) -> None :
152164 """Print version and exit."""
@@ -468,6 +480,12 @@ def _coerce_findings_list(value: object) -> list[Finding]:
468480 return [finding for finding in value if isinstance (finding , Finding )]
469481
470482
483+ def _coerce_llm_call_log (value : object ) -> list [dict [str , object ]]:
484+ if not isinstance (value , list ):
485+ return []
486+ return [item for item in value if isinstance (item , dict )]
487+
488+
471489def _coerce_file_cache (value : object ) -> dict [str , str ]:
472490 if not isinstance (value , dict ):
473491 return {}
@@ -550,6 +568,7 @@ def _cache_transitive_result(
550568 return _CachedTransitiveResult (
551569 filtered_findings = _coerce_findings_list (child_result .get ("filtered_findings" )),
552570 findings = _coerce_findings_list (child_result .get ("findings" )),
571+ llm_call_log = _coerce_llm_call_log (child_result .get ("llm_call_log" )),
553572 components = _source_aware_components (
554573 _coerce_str_path_list (child_result .get ("components" )), target
555574 ),
@@ -588,6 +607,7 @@ def _run_graph_scan(
588607 yara_dir : str | None = None ,
589608 baseline : Path | None = None ,
590609 show_suppressed : bool = False ,
610+ transitive_traversal : _TransitiveTraversalState | None = None ,
591611) -> dict [str , object ]:
592612 state = _scan_state_with_baseline (
593613 input_path = input_path ,
@@ -597,6 +617,8 @@ def _run_graph_scan(
597617 baseline = baseline ,
598618 show_suppressed = show_suppressed ,
599619 )
620+ if transitive_traversal is not None :
621+ state ["transitive_traversal_state" ] = transitive_traversal
600622 trace_config = _build_trace_config (input_path , format , no_llm )
601623 return graph .invoke (state , config = trace_config )
602624
@@ -625,6 +647,7 @@ def _scan_transitive(
625647 scan_cache : dict [str , _CachedTransitiveResult ] | None = None ,
626648 budget : _TransitiveBudget | None = None ,
627649 yara_dir : str | None = None ,
650+ traversal : _TransitiveTraversalState | None = None ,
628651) -> dict [str , object ]:
629652 if max_depth <= 0 :
630653 report_result = report (initial_result )
@@ -637,15 +660,21 @@ def _scan_transitive(
637660 report_result ["transitive_truncation_reasons" ] = []
638661 return report_result
639662
640- traversal = _TransitiveTraversalState (
641- cache = scan_cache if scan_cache is not None else {},
642- budget = budget if budget is not None else _TransitiveBudget (),
643- )
663+ if traversal is None :
664+ traversal = _TransitiveTraversalState (
665+ cache = scan_cache if scan_cache is not None else {},
666+ budget = budget if budget is not None else _TransitiveBudget (),
667+ )
668+ elif scan_cache is not None and traversal .cache is not scan_cache :
669+ traversal .cache = scan_cache
644670 transitive_sources : set [str ] = set ()
645671 merged_filtered_findings : list [Finding ] = _coerce_findings_list (
646672 initial_result .get ("filtered_findings" )
647673 )
648674 merged_findings : list [Finding ] = _coerce_findings_list (initial_result .get ("findings" ))
675+ merged_llm_call_log : list [dict [str , object ]] = _coerce_llm_call_log (
676+ initial_result .get ("llm_call_log" )
677+ )
649678 merged_components = _source_aware_components (
650679 _coerce_str_path_list (initial_result .get ("components" )), None
651680 )
@@ -684,11 +713,13 @@ def _scan_transitive(
684713 yara_dir = yara_dir ,
685714 baseline = baseline ,
686715 show_suppressed = show_suppressed ,
716+ transitive_traversal = traversal ,
687717 )
688718 cached = _cache_transitive_result (target , child_result )
689719 traversal .cache [target ] = cached
690- traversal .record_scan (cached . bytes_scanned )
720+ traversal .record_scan (0 )
691721 transitive_sources .add (target )
722+ merged_llm_call_log .extend (cached .llm_call_log )
692723 merged_filtered_findings .extend (
693724 _annotate_transitive_findings (
694725 cached .filtered_findings , source_url = target , transitive_depth = current_depth
@@ -727,17 +758,22 @@ def _scan_transitive(
727758 "component_metadata" : _merge_unique_component_metadata (component_metadata ),
728759 "file_cache" : merged_file_cache ,
729760 "has_executable_scripts" : has_executable_scripts ,
761+ "llm_call_log" : merged_llm_call_log ,
762+ "baseline" : baseline ,
763+ "show_suppressed" : show_suppressed ,
730764 "transitive_targets_scanned" : traversal .scanned_targets ,
731765 "transitive_bytes_scanned" : traversal .scanned_bytes ,
732766 "transitive_truncated" : bool (traversal .truncation_reasons ),
733767 "transitive_truncation_reasons" : traversal .truncation_reasons ,
734768 }
735- transitive_finding_count = sum (
736- 1 for finding in merged_filtered_findings if finding .source_url is not None
737- )
738769 report_result = report (merged_result )
739770 report_result ["temp_dir_for_cleanup" ] = initial_result .get ("temp_dir_for_cleanup" )
740- report_result ["transitive_finding_count" ] = transitive_finding_count
771+ active_findings = report_result .get ("active_findings" ) or []
772+ report_result ["transitive_finding_count" ] = sum (
773+ 1
774+ for finding in active_findings
775+ if isinstance (finding , Finding ) and finding .source_url is not None
776+ )
741777 report_result ["transitive_sources" ] = sorted (transitive_sources )
742778 report_result ["transitive_targets_scanned" ] = traversal .scanned_targets
743779 report_result ["transitive_bytes_scanned" ] = traversal .scanned_bytes
@@ -765,6 +801,7 @@ def _scan_skill(
765801 transitive_allow_prefix : tuple [str , ...] | list [str ] | None ,
766802 transitive_deny_prefix : tuple [str , ...] | list [str ] | None ,
767803 transitive_cache : dict [str , _CachedTransitiveResult ] | None = None ,
804+ transitive_traversal : _TransitiveTraversalState | None = None ,
768805) -> dict [str , object ]:
769806 yara_dir = str (yara_rules_dir .resolve ()) if yara_rules_dir else None
770807 active_visited : set [str ] = set ()
@@ -778,13 +815,16 @@ def _scan_skill(
778815 not no_llm ,
779816 transitive_enabled ,
780817 )
818+ if transitive_enabled and transitive_traversal is None :
819+ transitive_traversal = _TransitiveTraversalState (cache = transitive_cache or {})
781820 result = _run_graph_scan (
782821 input_path = input_path ,
783822 format = format ,
784823 no_llm = no_llm ,
785824 yara_dir = yara_dir ,
786825 baseline = baseline ,
787826 show_suppressed = show_suppressed ,
827+ transitive_traversal = transitive_traversal if transitive_enabled else None ,
788828 )
789829 if not transitive_enabled :
790830 return result
@@ -806,6 +846,7 @@ def _scan_skill(
806846 visited = active_visited ,
807847 scan_cache = transitive_cache ,
808848 yara_dir = yara_dir ,
849+ traversal = transitive_traversal ,
809850 )
810851 except Exception :
811852 raise
@@ -830,6 +871,7 @@ def _scan_multi_skill(
830871 console .print (f"[bold]Multi-skill directory detected:[/bold] { len (skills )} skills found\n " )
831872
832873 shared_transitive_cache : dict [str , _CachedTransitiveResult ] = {}
874+ shared_transitive_traversal = _TransitiveTraversalState (cache = shared_transitive_cache )
833875 results : list [dict [str , object ]] = []
834876 max_score = 0
835877 transitive_finding_count = 0
@@ -853,6 +895,7 @@ def _scan_multi_skill(
853895 transitive_allow_prefix = transitive_allow_prefix ,
854896 transitive_deny_prefix = transitive_deny_prefix ,
855897 transitive_cache = shared_transitive_cache ,
898+ transitive_traversal = shared_transitive_traversal ,
856899 )
857900 results .append (result )
858901 score = result .get ("risk_score" ) or 0
0 commit comments