modwire 11.0.3__tar.gz → 11.1.0__tar.gz

{modwire-11.0.3 → modwire-11.1.0}/.dev/modwire.egg-info/SOURCES.txt

@@ -13,6 +13,12 @@ uv.lock
 scripts/check_extractors.py
 scripts/generate_docs.py
 scripts/verify_consumer.py
+scripts/benchmarks/cache/__init__.py
+scripts/benchmarks/cache/benchmark_process_timeout.py
+scripts/benchmarks/cache/run.py
+scripts/benchmarks/report/__init__.py
+scripts/benchmarks/report/benchmark_process_timeout.py
+scripts/benchmarks/report/run.py
 src/modwire/__init__.py
 src/modwire/__main__.py
 src/modwire/application.py
@@ -154,7 +160,7 @@ src/modwire/cli/pipeline/models/extractor_command_input.py
 src/modwire/cli/pipeline/models/extractor_source_input.py
 src/modwire/cli/pipeline/models/report_pipeline_context.py
 src/modwire/cli/pipeline/models/source_entry.py
-src/modwire/cli/pipeline/models/source_inventory.py
+src/modwire/cli/pipeline/models/source_observation.py
 src/modwire/cli/pipeline/services/__init__.py
 src/modwire/cli/pipeline/services/batch_source_reader.py
 src/modwire/cli/pipeline/services/callables_insight.py
@@ -422,6 +428,7 @@ tests/application/test_07_cache.py
 tests/application/test_08_implementation_manifest.py
 tests/application/test_09_source_manifest_identity.py
 tests/application/test_10_assigned_value_evidence.py
+tests/application/test_11_source_observation.py
 tests/architecture/__init__.py
 tests/architecture/base_test.py
 tests/architecture/boundaries/__init__.py
@@ -440,9 +447,6 @@ tests/architecture/map/__init__.py
 tests/architecture/map/test_02_patterns.py
 tests/architecture/report/__init__.py
 tests/architecture/report/test_02_invariants.py
-tests/architecture/report_benchmark/__init__.py
-tests/architecture/report_benchmark/benchmark_process_timeout.py
-tests/architecture/report_benchmark/run.py
 tests/architecture/shape/__init__.py
 tests/architecture/shape/base_test.py
 tests/architecture/shape/test_01_limits.py
@@ -465,6 +469,7 @@ tests/cli/pipeline/test_03_interruption.py
 tests/cli/pipeline/test_04_command_transport.py
 tests/cli/pipeline/test_05_recovery.py
 tests/cli/pipeline/test_06_happy_path.py
+tests/cli/pipeline/test_07_report_commands.py
 tests/extraction/__init__.py
 tests/extraction/base_test.py
 tests/extraction/big_projects/__init__.py
@@ -473,9 +478,6 @@ tests/extraction/big_projects/projects.json
 tests/extraction/big_projects/resolution_results.json
 tests/extraction/big_projects/results.json
 tests/extraction/big_projects/run.py
-tests/extraction/cache_benchmark/__init__.py
-tests/extraction/cache_benchmark/benchmark_process_timeout.py
-tests/extraction/cache_benchmark/run.py
 tests/extraction/dependency/__init__.py
 tests/extraction/dependency/test_02_invariants.py
 tests/extraction/extractors/__init__.py

{modwire-11.0.3 → modwire-11.1.0}/Makefile

@@ -36,10 +36,10 @@ scan-benchmark:
 	uv run python -m tests.extraction.scan_benchmark.run --root .dev/benchmarks/scan-project --language "$(SCAN_BENCHMARK_LANGUAGE)" --excluded-pattern 'example_excluded/**'
 
 cache-benchmark:
-	uv run python -m tests.extraction.cache_benchmark.run --root "$(CACHE_BENCHMARK_ROOT)" --language "$(CACHE_BENCHMARK_LANGUAGE)" --cache-directory .dev/benchmarks/cache --incremental-source "$(CACHE_BENCHMARK_SOURCE)" --replacement-source "$(CACHE_BENCHMARK_REPLACEMENT)"
+	uv run python -m scripts.benchmarks.cache.run --root "$(CACHE_BENCHMARK_ROOT)" --language "$(CACHE_BENCHMARK_LANGUAGE)" --cache-directory .dev/benchmarks/cache --incremental-source "$(CACHE_BENCHMARK_SOURCE)" --replacement-source "$(CACHE_BENCHMARK_REPLACEMENT)"
 
 report-benchmark:
-	uv run python -m tests.architecture.report_benchmark.run --root "$(REPORT_BENCHMARK_ROOT)" --language "$(REPORT_BENCHMARK_LANGUAGE)" --cache-directory "$(REPORT_BENCHMARK_CACHE)" --cache-namespace "$(REPORT_BENCHMARK_NAMESPACE)"
+	uv run python -m scripts.benchmarks.report.run --root "$(REPORT_BENCHMARK_ROOT)" --language "$(REPORT_BENCHMARK_LANGUAGE)" --cache-directory "$(REPORT_BENCHMARK_CACHE)" --cache-namespace "$(REPORT_BENCHMARK_NAMESPACE)"
 
 docs-check:
 	uv run python scripts/generate_docs.py --check

{modwire-11.0.3 → modwire-11.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modwire
-Version: 11.0.3
+Version: 11.1.0
 Summary: Code extraction, architecture analysis and the Modwire CLI.
 Author: Tomasz Szpak
 License-Expression: MIT
@@ -80,6 +80,10 @@ Return a code map with content-addressed source and complete-source-set reuse.
 
 Return a code map and public outcomes for extraction and complete-map reuse.
 
+### `generate_map_cached_from_observation_with_diagnostics`
+
+Return a cached code map derived from the exact supplied source observation.
+
 ### `generate_queryable_map_cached`
 
 Return a queryable code map with content-addressed persistent reuse.
@@ -88,6 +92,14 @@ Return a queryable code map with content-addressed persistent reuse.
 
 Return a queryable code map and public outcomes for every applicable cache stage.
 
+### `generate_queryable_map_cached_from_observation_with_diagnostics`
+
+Return a queryable cached map derived from the exact supplied source observation.
+
+### `observe_sources`
+
+Observe one complete immutable canonical source inventory without parsing source.
+
 ### `source_manifest_identity`
 
 Observe the current canonical source-manifest identity without parsing source.
@@ -140,7 +152,8 @@ Extraction counts describe current source records. An exact code-map hit
 reports its digest-backed source-set entries as extraction hits without loading
 individual source payloads. Code-map and report counts describe one entry.
 Invalidated entries are also misses. Diagnostics include the configured
-namespace but never cache keys, source identities, or content.
+namespace but never cache keys, source identities, or content. The reuse flag
+states whether the exact supplied source observation drove the cache operation.
 
 ## `CachedResult`
 
@@ -174,6 +187,14 @@ Kinds of class-property assignment evidence published by extractors.
 
 Canonical identity of one observed source manifest.
 
+## `SourceObservation`
+
+Immutable canonical source inventory reusable by identity and cached map operations.
+
+### `identity`
+
+Return the canonical public identity of this observed source manifest.
+
 ## `SourceMemberKind`
 
 Ownership kind for a declared class or type member.

{modwire-11.0.3 → modwire-11.1.0}/README.md

@@ -52,6 +52,10 @@ Return a code map with content-addressed source and complete-source-set reuse.
 
 Return a code map and public outcomes for extraction and complete-map reuse.
 
+### `generate_map_cached_from_observation_with_diagnostics`
+
+Return a cached code map derived from the exact supplied source observation.
+
 ### `generate_queryable_map_cached`
 
 Return a queryable code map with content-addressed persistent reuse.
@@ -60,6 +64,14 @@ Return a queryable code map with content-addressed persistent reuse.
 
 Return a queryable code map and public outcomes for every applicable cache stage.
 
+### `generate_queryable_map_cached_from_observation_with_diagnostics`
+
+Return a queryable cached map derived from the exact supplied source observation.
+
+### `observe_sources`
+
+Observe one complete immutable canonical source inventory without parsing source.
+
 ### `source_manifest_identity`
 
 Observe the current canonical source-manifest identity without parsing source.
@@ -112,7 +124,8 @@ Extraction counts describe current source records. An exact code-map hit
 reports its digest-backed source-set entries as extraction hits without loading
 individual source payloads. Code-map and report counts describe one entry.
 Invalidated entries are also misses. Diagnostics include the configured
-namespace but never cache keys, source identities, or content.
+namespace but never cache keys, source identities, or content. The reuse flag
+states whether the exact supplied source observation drove the cache operation.
 
 ## `CachedResult`
 
@@ -146,6 +159,14 @@ Kinds of class-property assignment evidence published by extractors.
 
 Canonical identity of one observed source manifest.
 
+## `SourceObservation`
+
+Immutable canonical source inventory reusable by identity and cached map operations.
+
+### `identity`
+
+Return the canonical public identity of this observed source manifest.
+
 ## `SourceMemberKind`
 
 Ownership kind for a declared class or type member.

{modwire-11.0.3/tests/extraction/cache_benchmark → modwire-11.1.0/scripts/benchmarks/cache}/run.py

@@ -132,7 +132,10 @@ class CacheBenchmark:
 
                 total_started = time.perf_counter()
                 cold_plan, measurement["cold_inventory"] = self._phase(
-                    repetition, "cold", "inventory", lambda: application.cli.prepare_cache(request, policy)
+                    repetition,
+                    "cold",
+                    "inventory",
+                    lambda: application.cli.prepare_cache(application.cli.observe(request, policy)),
                 )
                 cold_cached_map, measurement["cold_code_map_loading"] = self._phase(
                     repetition,
@@ -146,7 +149,7 @@ class CacheBenchmark:
                     repetition,
                     "cold",
                     "source_loading",
-                    lambda: application.cli.cached_sources(request, cold_plan, options),
+                    lambda: application.cli.cached_sources(cold_plan, options),
                 )
                 _, measurement["cold_source_set_maintenance"] = self._phase(
                     repetition,
@@ -177,7 +180,10 @@ class CacheBenchmark:
 
                 total_started = time.perf_counter()
                 warm_plan, measurement["warm_inventory"] = self._phase(
-                    repetition, "warm", "inventory", lambda: application.cli.prepare_cache(request, policy)
+                    repetition,
+                    "warm",
+                    "inventory",
+                    lambda: application.cli.prepare_cache(application.cli.observe(request, policy)),
                 )
                 warm_cached_map, measurement["warm_code_map_loading"] = self._phase(
                     repetition,
@@ -206,7 +212,7 @@ class CacheBenchmark:
                     repetition,
                     "incremental",
                     "inventory",
-                    lambda: application.cli.prepare_cache(request, policy),
+                    lambda: application.cli.prepare_cache(application.cli.observe(request, policy)),
                 )
                 incremental_cached_map, measurement["incremental_code_map_loading"] = self._phase(
                     repetition,
@@ -220,7 +226,7 @@ class CacheBenchmark:
                     repetition,
                     "incremental",
                     "source_loading",
-                    lambda: application.cli.cached_sources(request, incremental_plan, options),
+                    lambda: application.cli.cached_sources(incremental_plan, options),
                 )
                 _, measurement["incremental_source_set_maintenance"] = self._phase(
                     repetition,

{modwire-11.0.3/tests/architecture/report_benchmark → modwire-11.1.0/scripts/benchmarks/report}/run.py

@@ -107,7 +107,7 @@ class ReportBenchmark:
         cleanup_reserve = min(1.0, max_process_seconds * 0.1)
         supervisor_seconds = max_process_seconds - cleanup_reserve
         if Path(sys.argv[0]).resolve() == Path(__file__).resolve():
-            entrypoint = [sys.executable, "-m", "tests.architecture.report_benchmark.run"]
+            entrypoint = [sys.executable, "-m", "scripts.benchmarks.report.run"]
         else:
             entrypoint = [sys.executable, sys.argv[0]]
         command = [*entrypoint, *sys.argv[1:], "--worker"]
@@ -228,7 +228,10 @@ class ReportBenchmark:
             cache_file = self.code_map_cache_file
             if cache_file is None:
                 plan, measurement["inventory"] = self._phase(
-                    repetition, "map", "inventory", lambda: application.cli.prepare_cache(request, policy)
+                    repetition,
+                    "map",
+                    "inventory",
+                    lambda: application.cli.prepare_cache(application.cli.observe(request, policy)),
                 )
                 cached_map, measurement["code_map_loading"] = self._phase(
                     repetition, "map", "code_map_loading", lambda: application.cli.cached_code_map(plan, options)
@@ -240,7 +243,7 @@ class ReportBenchmark:
                         repetition,
                         "map",
                         "extraction_loading",
-                        lambda: application.cli.cached_sources(request, plan, options),
+                        lambda: application.cli.cached_sources(plan, options),
                     )
                     _, measurement["source_set_maintenance"] = self._phase(
                         repetition,

{modwire-11.0.3 → modwire-11.1.0}/src/modwire/application.py

@@ -15,6 +15,7 @@ from .cli.cache.models.cache_outcome import CacheOutcome
 from .cli.cache.models.cache_stage import CacheStage
 from .cli.cache.models.cached_result import CachedResult
 from .cli.facade import CliFacade
+from .cli.pipeline.models.source_observation import SourceObservation
 from .extraction.facade import ExtractionFacade
 from .implementation.facade import ImplementationFacade
 from .implementation.manifest.models.implementation_manifest import ImplementationManifest
@@ -57,6 +58,7 @@ __all__ = [
     "SourceAssignedValueKind",
     "SourceMemberKind",
     "SourceManifestIdentity",
+    "SourceObservation",
     "SourceRelationKind",
 ]
 
@@ -157,8 +159,18 @@ class ModwireApplication:
     ) -> CachedResult[CodeMap]:
         """Return a code map and public outcomes for extraction and complete-map reuse."""
 
-        request = self.extraction.request(language, str(root))
-        plan = self.cli.prepare_cache(request, policy)
+        observation = self.observe_sources(language, root, policy)
+        cached = self.generate_map_cached_from_observation_with_diagnostics(observation, options)
+        outcomes = tuple(outcome.model_copy(update={"source_observation_reused": False}) for outcome in cached.outcomes)
+        return CachedResult(value=cached.value, outcomes=outcomes)
+
+    def generate_map_cached_from_observation_with_diagnostics(
+        self, observation: SourceObservation, options: CacheOptions
+    ) -> CachedResult[CodeMap]:
+        """Return a cached code map derived from the exact supplied source observation."""
+
+        request = observation.request
+        plan = self.cli.prepare_cache(observation)
         cached = self.cli.cached_code_map(plan, options)
         outcome = cached.outcome(CacheStage.CODE_MAP)
         if cached.value is not None:
@@ -171,14 +183,18 @@ class ModwireApplication:
                 ),
             )
         else:
-            sources = self.cli.cached_sources(request, plan, options)
+            sources = self.cli.cached_sources(plan, options)
             self.cli.maintain_source_set(plan, options)
             code_map = self.extraction.generate_map(request, sources.value)
             self.cli.store_code_map(plan, code_map, options)
             outcome = outcome.model_copy(update={"computed": 1, "stored": 1})
             extraction_outcomes = sources.outcomes
         self.cli.maintain_cache(options)
-        return CachedResult(value=code_map, outcomes=(*extraction_outcomes, outcome))
+        outcomes = tuple(
+            cache_outcome.model_copy(update={"source_observation_reused": True})
+            for cache_outcome in (*extraction_outcomes, outcome)
+        )
+        return CachedResult(value=code_map, outcomes=outcomes)
 
     def generate_queryable_map_cached(
         self, language: str, root: str, policy: ScanPolicy, options: CacheOptions
@@ -195,11 +211,24 @@ class ModwireApplication:
         cached = self.generate_map_cached_with_diagnostics(language, root, policy, options)
         return CachedResult(value=QueryableCodeMap(code_map=cached.value), outcomes=cached.outcomes)
 
+    def generate_queryable_map_cached_from_observation_with_diagnostics(
+        self, observation: SourceObservation, options: CacheOptions
+    ) -> CachedResult[QueryableCodeMap]:
+        """Return a queryable cached map derived from the exact supplied source observation."""
+
+        cached = self.generate_map_cached_from_observation_with_diagnostics(observation, options)
+        return CachedResult(value=QueryableCodeMap(code_map=cached.value), outcomes=cached.outcomes)
+
+    def observe_sources(self, language: str, root: str, policy: ScanPolicy) -> SourceObservation:
+        """Observe one complete immutable canonical source inventory without parsing source."""
+
+        request = self.extraction.request(language, str(root))
+        return self.cli.observe(request, policy)
+
     def source_manifest_identity(self, language: str, root: str, policy: ScanPolicy) -> SourceManifestIdentity:
         """Observe the current canonical source-manifest identity without parsing source."""
 
-        request = self.extraction.request(language, str(root))
-        return self.cli.source_manifest_identity(request, policy)
+        return self.observe_sources(language, root, policy).identity()
 
     def implementation_manifest(self, code_map: CodeMap, format: ManifestFormat) -> ImplementationManifestDocument:
         """Publish a deterministic, provenance-bearing implementation manifest."""
@@ -246,6 +275,7 @@ class ModwireApplication:
                 SourceAssignedValue,
                 SourceAssignedValueKind,
                 SourceManifestIdentity,
+                SourceObservation,
                 SourceMemberKind,
                 SourceRelationKind,
                 ImplementationManifest,

{modwire-11.0.3 → modwire-11.1.0}/src/modwire/cli/cache/application.py

@@ -16,6 +16,7 @@ from ...shared.code.models.scan_policy import ScanPolicy
 from ...shared.code.models.source_extraction import SourceExtraction
 from ...shared.code.models.source_file import SourceFile
 from ..pipeline.domain import SourceReader
+from ..pipeline.models.source_observation import SourceObservation
 from .domain import CacheStorage
 from .models.cache_key import CacheKey
 from .models.cache_options import CacheOptions
@@ -43,26 +44,26 @@ class CacheApplication:
         self.reader.ensure_available(request.runtime)
         return self.reader.extract_source(request, policy)
 
-    def prepare(self, request: ExtractionRequest, policy: ScanPolicy) -> CachePlan:
-        self.reader.ensure_available(request.runtime)
-        inventory = self.reader.inventory(request, policy)
+    def prepare(self, observation: SourceObservation) -> CachePlan:
+        request = observation.request
+        policy = observation.manifest.policy
         sources = tuple(
             SourceCacheEntry(
                 entry=entry,
-                key=self.identity.source(request, policy, inventory.manifest.runtime, entry),
+                key=self.identity.source(request, policy, observation.manifest.runtime, entry),
             )
-            for entry in inventory.entries
+            for entry in observation.entries
         )
         return CachePlan(
             language=request.runtime.descriptor.language,
-            inventory=inventory,
+            observation=observation,
             sources=sources,
-            source_set=self.identity.source_set(request, inventory.manifest, sources),
+            source_set=self.identity.source_set(request, observation.manifest, sources),
         )
 
-    def sources(
-        self, request: ExtractionRequest, plan: CachePlan, options: CacheOptions
-    ) -> CachedResult[SourceExtraction]:
+    def sources(self, plan: CachePlan, options: CacheOptions) -> CachedResult[SourceExtraction]:
+        observation = plan.observation
+        request = observation.request
         payloads = self.storage.read_many(options, tuple(source.key for source in plan.sources))
         files: dict[FileId, SourceFile] = {}
         misses: list[FileId] = []
@@ -86,9 +87,9 @@ class CacheApplication:
                 misses.append(source.entry.source_id)
         self.storage.delete_many(options, tuple(invalid_keys))
 
-        if misses or not plan.inventory.entries:
+        if misses or not observation.entries:
             self.reader.ensure_available(request.runtime)
-        extracted = self.reader.extract_entries(request, plan.inventory, tuple(misses))
+        extracted = self.reader.extract_entries(observation, tuple(misses))
         writes: list[tuple[CacheKey, bytes]] = []
         for source_id in misses:
             source_file = extracted.get(source_id)
@@ -110,10 +111,10 @@ class CacheApplication:
         extraction = SourceExtraction(
             files=ordered_files,
             modules=modules,
-            manifest=plan.inventory.manifest,
-            files_found=plan.inventory.files_found,
-            files_excluded=plan.inventory.files_excluded,
-            directories_pruned=plan.inventory.directories_pruned,
+            manifest=observation.manifest,
+            files_found=observation.files_found,
+            files_excluded=observation.files_excluded,
+            directories_pruned=observation.directories_pruned,
         )
         return CachedResult(
             value=extraction,
@@ -142,7 +143,7 @@ class CacheApplication:
         cached_value, cached_invalidated = self._read(options, key)
         try:
             value = CodeMap.model_validate(cached_value)
-            if value.extraction.manifest != plan.inventory.manifest:
+            if value.extraction.manifest != plan.observation.manifest:
                 raise ValueError("Cached code map provenance does not match the current source manifest.")
             outcome = CacheOutcome(stage=CacheStage.CODE_MAP, namespace=options.namespace, hits=1)
         except (TypeError, ValueError, ValidationError):

{modwire-11.0.3 → modwire-11.1.0}/src/modwire/cli/cache/models/cache_outcome.py

@@ -11,7 +11,8 @@ class CacheOutcome(ValueModel):
     reports its digest-backed source-set entries as extraction hits without loading
     individual source payloads. Code-map and report counts describe one entry.
     Invalidated entries are also misses. Diagnostics include the configured
-    namespace but never cache keys, source identities, or content.
+    namespace but never cache keys, source identities, or content. The reuse flag
+    states whether the exact supplied source observation drove the cache operation.
     """
 
     stage: CacheStage
@@ -21,6 +22,7 @@ class CacheOutcome(ValueModel):
     invalidated: int = 0
     computed: int = 0
     stored: int = 0
+    source_observation_reused: bool = False
 
     @field_validator("namespace")
     @classmethod

{modwire-11.0.3 → modwire-11.1.0}/src/modwire/cli/cache/models/cache_plan.py

@@ -1,18 +1,18 @@
 from ....shared.values.models.value_model import ValueModel
-from ...pipeline.models.source_inventory import SourceInventory
+from ...pipeline.models.source_observation import SourceObservation
 from .cache_key import CacheKey
 from .source_cache_entry import SourceCacheEntry
 
 
 class CachePlan(ValueModel):
     language: str
-    inventory: SourceInventory
+    observation: SourceObservation
     sources: tuple[SourceCacheEntry, ...]
     source_set: CacheKey
 
     def source_set_value(self) -> dict[str, object]:
         return {
-            "source_manifest": self.inventory.manifest.digest,
+            "source_manifest": self.observation.manifest.digest,
             "sources": [
                 {
                     "relative_path": source.entry.relative_path,

{modwire-11.0.3 → modwire-11.1.0}/src/modwire/cli/facade.py

@@ -25,6 +25,7 @@ from .pipeline.application import PipelineApplication
 from .pipeline.models.command_name import CommandName
 from .pipeline.models.command_request import CommandRequest
 from .pipeline.models.extractor_command_input import ExtractorCommandInput
+from .pipeline.models.source_observation import SourceObservation
 
 
 @injectable
@@ -52,19 +53,20 @@ class CliFacade:
     def extract(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceExtraction:
         return self.pipeline.extract(request, policy)
 
+    def observe(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceObservation:
+        return self.pipeline.observe(request, policy)
+
     def source_manifest_identity(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceManifestIdentity:
         return self.pipeline.source_manifest_identity(request, policy)
 
     def has_source_files(self, request: ExtractionRequest, policy: ScanPolicy) -> bool:
         return self.pipeline.has_source_files(request, policy)
 
-    def prepare_cache(self, request: ExtractionRequest, policy: ScanPolicy) -> CachePlan:
-        return self.cache.prepare(request, policy)
+    def prepare_cache(self, observation: SourceObservation) -> CachePlan:
+        return self.cache.prepare(observation)
 
-    def cached_sources(
-        self, request: ExtractionRequest, plan: CachePlan, options: CacheOptions
-    ) -> CachedResult[SourceExtraction]:
-        return self.cache.sources(request, plan, options)
+    def cached_sources(self, plan: CachePlan, options: CacheOptions) -> CachedResult[SourceExtraction]:
+        return self.cache.sources(plan, options)
 
     def maintain_source_set(self, plan: CachePlan, options: CacheOptions) -> bool:
         return self.cache.maintain_source_set(plan, options)
@@ -148,10 +150,11 @@ class CliFacade:
             extraction = self.extract(extraction_request, policy)
             code_map = self.extraction.generate_queryable_map(extraction_request, extraction)
             return self.render(self.architecture.analyze(code_map, config), request.summary)
-        plan = self.prepare_cache(extraction_request, policy)
+        observation = self.observe(extraction_request, policy)
+        plan = self.prepare_cache(observation)
         cached_code_map = self.cached_code_map(plan, cache_options).value
         if cached_code_map is None:
-            extraction = self.cached_sources(extraction_request, plan, cache_options).value
+            extraction = self.cached_sources(plan, cache_options).value
             self.maintain_source_set(plan, cache_options)
             cached_code_map = self.extraction.generate_map(extraction_request, extraction)
             self.store_code_map(plan, cached_code_map, cache_options)

{modwire-11.0.3 → modwire-11.1.0}/src/modwire/cli/pipeline/application.py

@@ -14,6 +14,7 @@ from .domain import ReportPipelineStep, SourceReader
 from .models.command_request import CommandRequest
 from .models.extractor_command_input import ExtractorCommandInput
 from .models.report_pipeline_context import ReportPipelineContext
+from .models.source_observation import SourceObservation
 from .services.command_line import CommandLine
 from .services.configuration_loader import ConfigurationLoader
 from .services.extractor_command import ExtractorCommand
@@ -38,13 +39,12 @@ class PipelineApplication:
         self.reader.ensure_available(request.runtime)
         return self.reader.extract_source(request, policy)
 
-    def source_manifest_identity(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceManifestIdentity:
+    def observe(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceObservation:
         self.reader.ensure_available(request.runtime)
-        manifest = self.reader.inventory(request, policy).manifest
-        return SourceManifestIdentity(
-            digest_algorithm=manifest.digest_algorithm,
-            digest=manifest.digest,
-        )
+        return self.reader.observe(request, policy)
+
+    def source_manifest_identity(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceManifestIdentity:
+        return self.observe(request, policy).identity()
 
     def has_source_files(self, request: ExtractionRequest, policy: ScanPolicy) -> bool:
         self.reader.ensure_available(request.runtime)

{modwire-11.0.3 → modwire-11.1.0}/src/modwire/cli/pipeline/domain.py

@@ -7,7 +7,7 @@ from ...shared.code.models.scan_policy import ScanPolicy
 from ...shared.code.models.source_extraction import SourceExtraction
 from ...shared.code.models.source_file import SourceFile
 from .models.report_pipeline_context import ReportPipelineContext
-from .models.source_inventory import SourceInventory
+from .models.source_observation import SourceObservation
 
 
 class ReportPipelineStep(ABC):
@@ -28,12 +28,12 @@ class SourceReader(ABC):
         raise NotImplementedError
 
     @abstractmethod
-    def inventory(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceInventory:
+    def observe(self, request: ExtractionRequest, policy: ScanPolicy) -> SourceObservation:
         raise NotImplementedError
 
     @abstractmethod
     def extract_entries(
-        self, request: ExtractionRequest, inventory: SourceInventory, source_ids: tuple[FileId, ...]
+        self, observation: SourceObservation, source_ids: tuple[FileId, ...]
     ) -> dict[FileId, SourceFile]:
         raise NotImplementedError
 

modwire-11.1.0/src/modwire/cli/pipeline/models/source_observation.py

@@ -0,0 +1,23 @@
+from pydantic import Field
+
+from ....extraction.extractors.models.extraction_request import ExtractionRequest
+from ....shared.code.models.source_manifest import SourceManifest
+from ....shared.code.models.source_manifest_identity import SourceManifestIdentity
+from ....shared.values.models.value_model import ValueModel
+from .source_entry import SourceEntry
+
+
+class SourceObservation(ValueModel):
+    """Immutable canonical source inventory reusable by identity and cached map operations."""
+
+    request: ExtractionRequest
+    entries: tuple[SourceEntry, ...]
+    files_found: int = Field(ge=0)
+    files_excluded: int = Field(ge=0)
+    directories_pruned: int = Field(ge=0)
+    manifest: SourceManifest
+
+    def identity(self) -> SourceManifestIdentity:
+        """Return the canonical public identity of this observed source manifest."""
+
+        return self.manifest.identity()