modwire 11.0.2__tar.gz → 11.0.3__tar.gz

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

@@ -147,6 +147,7 @@ src/modwire/cli/pipeline/batching/fixed_planner.py
 src/modwire/cli/pipeline/batching/plan.py
 src/modwire/cli/pipeline/batching/planner.py
 src/modwire/cli/pipeline/models/__init__.py
+src/modwire/cli/pipeline/models/command_name.py
 src/modwire/cli/pipeline/models/command_request.py
 src/modwire/cli/pipeline/models/extractor_batch_input.py
 src/modwire/cli/pipeline/models/extractor_command_input.py
@@ -180,6 +181,7 @@ src/modwire/cli/resources/application.py
 src/modwire/cli/resources/models/__init__.py
 src/modwire/cli/resources/models/defaults.py
 src/modwire/cli/resources/models/init_asset.py
+src/modwire/cli/resources/models/init_target_base.py
 src/modwire/cli/resources/templates/AGENTS.md
 src/modwire/cli/resources/templates/ARCHITECTURE.md
 src/modwire/cli/resources/templates/INDEX.md
@@ -202,9 +204,9 @@ src/modwire/extraction/extractors/application.py
 src/modwire/extraction/extractors/domain.py
 src/modwire/extraction/extractors/models/__init__.py
 src/modwire/extraction/extractors/models/batch_config.py
+src/modwire/extraction/extractors/models/batch_output_format.py
 src/modwire/extraction/extractors/models/extraction_request.py
 src/modwire/extraction/extractors/models/extractor_resource.py
-src/modwire/extraction/extractors/models/extractor_resource_set.py
 src/modwire/extraction/extractors/models/extractor_runtime.py
 src/modwire/extraction/extractors/models/parsed_source_batch.py
 src/modwire/extraction/extractors/models/parsed_source_file.py
@@ -222,6 +224,7 @@ src/modwire/extraction/extractors/python/observations/function_candidate.py
 src/modwire/extraction/extractors/python/observations/import_candidate.py
 src/modwire/extraction/extractors/python/observations/inheritance_candidate.py
 src/modwire/extraction/extractors/python/observations/property_candidate.py
+src/modwire/extraction/extractors/python/observations/property_scope.py
 src/modwire/extraction/extractors/python/observations/source_context.py
 src/modwire/extraction/extractors/python/observations/source_observation.py
 src/modwire/extraction/extractors/python/observations/value_candidate.py
@@ -273,6 +276,7 @@ src/modwire/extraction/extractors/python/semantics/properties/annotated_instance
 src/modwire/extraction/extractors/python/semantics/properties/assigned_class_rule.py
 src/modwire/extraction/extractors/python/semantics/properties/assigned_instance_rule.py
 src/modwire/extraction/extractors/python/semantics/properties/classifier.py
+src/modwire/extraction/extractors/python/semantics/properties/decorated_method_rule.py
 src/modwire/extraction/extractors/python/source_facts/call_contributor.py
 src/modwire/extraction/extractors/python/source_facts/callable_contributor.py
 src/modwire/extraction/extractors/python/source_facts/class_contributor.py
@@ -288,6 +292,7 @@ src/modwire/extraction/extractors/python/source_facts/value_contributor.py
 src/modwire/extraction/extractors/python/traversal/context.py
 src/modwire/extraction/extractors/python/traversal/observation_reader.py
 src/modwire/extraction/extractors/python/traversal/ordered_observation_visitor.py
+src/modwire/extraction/extractors/python/traversal/traversal_role.py
 src/modwire/extraction/extractors/resources/__init__.py
 src/modwire/extraction/extractors/resources/php/build.php
 src/modwire/extraction/extractors/resources/php/build.py
@@ -314,18 +319,20 @@ src/modwire/implementation/manifest/contracts/__init__.py
 src/modwire/implementation/manifest/contracts/manifest_compiler.py
 src/modwire/implementation/manifest/contracts/manifest_serializer.py
 src/modwire/implementation/manifest/models/__init__.py
-src/modwire/implementation/manifest/models/digest_algorithm.py
 src/modwire/implementation/manifest/models/implementation_manifest.py
 src/modwire/implementation/manifest/models/implementation_manifest_document.py
 src/modwire/implementation/manifest/models/manifest_annotation.py
+src/modwire/implementation/manifest/models/manifest_annotation_role.py
 src/modwire/implementation/manifest/models/manifest_attribute.py
 src/modwire/implementation/manifest/models/manifest_callable.py
 src/modwire/implementation/manifest/models/manifest_dependency.py
+src/modwire/implementation/manifest/models/manifest_dependency_target_kind.py
 src/modwire/implementation/manifest/models/manifest_format.py
 src/modwire/implementation/manifest/models/manifest_inheritance.py
 src/modwire/implementation/manifest/models/manifest_parameter.py
 src/modwire/implementation/manifest/models/manifest_span.py
 src/modwire/implementation/manifest/models/manifest_symbol.py
+src/modwire/implementation/manifest/models/manifest_symbol_kind.py
 src/modwire/implementation/manifest/services/__init__.py
 src/modwire/implementation/manifest/services/canonical_json_manifest_serializer.py
 src/modwire/implementation/manifest/services/code_map_manifest_compiler.py
@@ -344,13 +351,16 @@ src/modwire/shared/code/models/declaration_identity.py
 src/modwire/shared/code/models/dependency_edge_result.py
 src/modwire/shared/code/models/dependency_graph.py
 src/modwire/shared/code/models/dependency_node_result.py
+src/modwire/shared/code/models/digest_algorithm.py
 src/modwire/shared/code/models/duplicate_identity_error.py
 src/modwire/shared/code/models/edge.py
-src/modwire/shared/code/models/edge_resolution.py
 src/modwire/shared/code/models/extractor_descriptor.py
 src/modwire/shared/code/models/fact_capability.py
 src/modwire/shared/code/models/identity.py
+src/modwire/shared/code/models/identity_kind.py
+src/modwire/shared/code/models/import_crossing_type.py
 src/modwire/shared/code/models/node.py
+src/modwire/shared/code/models/node_kind.py
 src/modwire/shared/code/models/query_builder.py
 src/modwire/shared/code/models/query_types.py
 src/modwire/shared/code/models/queryable_code_map.py
@@ -361,12 +371,16 @@ src/modwire/shared/code/models/source_artifact.py
 src/modwire/shared/code/models/source_assigned_value.py
 src/modwire/shared/code/models/source_assigned_value_kind.py
 src/modwire/shared/code/models/source_call.py
+src/modwire/shared/code/models/source_call_resolution.py
 src/modwire/shared/code/models/source_callable.py
+src/modwire/shared/code/models/source_callable_kind.py
 src/modwire/shared/code/models/source_callable_symbol.py
 src/modwire/shared/code/models/source_class.py
 src/modwire/shared/code/models/source_class_method.py
 src/modwire/shared/code/models/source_class_property.py
+src/modwire/shared/code/models/source_dependency_resolution.py
 src/modwire/shared/code/models/source_export.py
+src/modwire/shared/code/models/source_export_kind.py
 src/modwire/shared/code/models/source_extraction.py
 src/modwire/shared/code/models/source_file.py
 src/modwire/shared/code/models/source_file_result.py
@@ -380,13 +394,17 @@ src/modwire/shared/code/models/source_manifest.py
 src/modwire/shared/code/models/source_manifest_identity.py
 src/modwire/shared/code/models/source_member_kind.py
 src/modwire/shared/code/models/source_parameter.py
+src/modwire/shared/code/models/source_parameter_kind.py
 src/modwire/shared/code/models/source_relation_kind.py
 src/modwire/shared/code/models/source_signature.py
+src/modwire/shared/code/models/source_signature_kind.py
 src/modwire/shared/code/models/source_symbol.py
 src/modwire/shared/code/models/source_type.py
 src/modwire/shared/code/models/source_value.py
+src/modwire/shared/code/models/source_value_declaration_kind.py
+src/modwire/shared/code/models/source_value_kind.py
 src/modwire/shared/code/models/source_value_scope.py
-src/modwire/shared/code/models/types.py
+src/modwire/shared/code/models/source_visibility.py
 src/modwire/shared/code/services/__init__.py
 src/modwire/shared/code/services/glob_path_matcher.py
 src/modwire/shared/code/services/identity_resolver.py

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modwire
-Version: 11.0.2
+Version: 11.0.3
 Summary: Code extraction, architecture analysis and the Modwire CLI.
 Author: Tomasz Szpak
 License-Expression: MIT

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

@@ -17,7 +17,6 @@ from .cli.cache.models.cached_result import CachedResult
 from .cli.facade import CliFacade
 from .extraction.facade import ExtractionFacade
 from .implementation.facade import ImplementationFacade
-from .implementation.manifest.models.digest_algorithm import DigestAlgorithm
 from .implementation.manifest.models.implementation_manifest import ImplementationManifest
 from .implementation.manifest.models.implementation_manifest_document import ImplementationManifestDocument
 from .implementation.manifest.models.manifest_format import ManifestFormat
@@ -26,6 +25,7 @@ from .shared.code.models.capability_status import CapabilityStatus
 from .shared.code.models.code_map import CodeMap
 from .shared.code.models.declaration_family import DeclarationFamily
 from .shared.code.models.declaration_identity import DeclarationIdentity
+from .shared.code.models.digest_algorithm import DigestAlgorithm
 from .shared.code.models.fact_capability import FactCapability
 from .shared.code.models.queryable_code_map import QueryableCodeMap
 from .shared.code.models.scan_policy import ScanPolicy

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/architecture/boundaries/services/module_boundary_analyzer.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 
 from wireup import injectable
 
+from ....shared.code.models.source_dependency_resolution import SourceDependencyResolution
 from ...config.models.boundaries_config import BoundariesConfig
 from ...config.models.boundary_rule import BoundaryRule
 from ...map.models.architecture_map import ArchitectureMap
@@ -32,7 +33,7 @@ class ModuleBoundaryAnalyzer(FlowAnalyzerInterface):
         ]
         for dependency in architecture_map.code_map.dependency_edges().all():
             edge = dependency.edge
-            if edge.resolution != "resolved" or edge.to_id is None:
+            if edge.resolution is not SourceDependencyResolution.RESOLVED or edge.to_id is None:
                 continue
             source_tags = architecture_map.tag_map.tags_for(edge.from_id)
             target_tags = architecture_map.tag_map.tags_for(edge.to_id)

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/architecture/config/models/shape_rules.py

@@ -1,5 +1,6 @@
 from pydantic import Field
 
+from ....shared.code.models.import_crossing_type import ImportCrossingType
 from .configuration_value import ConfigurationValue
 
 
@@ -20,4 +21,7 @@ class ShapeRules(ConfigurationValue):
     allow_optional_class_properties: bool = False
     allow_import_aliases: bool = False
     require_joined_imports: bool = True
-    allowed_import_crossing_types: tuple[str, ...] = ("module", "symbol")
+    allowed_import_crossing_types: tuple[ImportCrossingType, ...] = (
+        ImportCrossingType.MODULE,
+        ImportCrossingType.SYMBOL,
+    )

modwire-11.0.3/src/modwire/architecture/insights/models/exports_report_item.py

@@ -0,0 +1,11 @@
+from ....shared.code.models.import_crossing_type import ImportCrossingType
+from ....shared.code.models.source_export_kind import SourceExportKind
+from ....shared.values.models.value_model import ValueModel
+
+
+class ExportsReportItem(ValueModel):
+    source_id: str
+    name: str
+    kind: SourceExportKind
+    crossing_type: ImportCrossingType
+    reason: str

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/architecture/insights/services/coherence_reporter.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from wireup import injectable
 
 from ....shared.code.models.identity import FileId
+from ....shared.code.models.source_dependency_resolution import SourceDependencyResolution
 from ...map.models.architecture_map import ArchitectureMap
 from ..domain import InsightReporterInterface
 from ..models.coherence_report import CoherenceReport
@@ -35,7 +36,9 @@ class CoherenceReporter(InsightReporterInterface):
             if not has_incoming and (not has_outgoing):
                 isolated.append(source_id)
         external_dependencies = {
-            edge.specifier for edge in graph.external_edges(source_ids) if edge.resolution == "external"
+            edge.specifier
+            for edge in graph.external_edges(source_ids)
+            if edge.resolution is SourceDependencyResolution.EXTERNAL
         }
         return self.report_type(
             roots=tuple(roots),

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/architecture/shape/services/file_resolver.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from wireup import injectable
 
 from ....shared.code.models.identity import FileId
+from ....shared.code.models.source_value_declaration_kind import SourceValueDeclarationKind
 from ....shared.code.models.source_value_scope import SourceValueScope
 from ...config.models.shape_rules import ShapeRules
 from ..domain import BaseShapeResolver, ShapeResolverInterface
@@ -75,7 +76,8 @@ class FileResolver(ShapeResolverInterface, BaseShapeResolver):
                         source_id=source_id,
                         rule_name="max_variables_per_file",
                         actual=sum(
-                            value.scope == SourceValueScope.MODULE and value.declaration_kind == "assignment"
+                            value.scope is SourceValueScope.MODULE
+                            and value.declaration_kind is SourceValueDeclarationKind.ASSIGNMENT
                             for value in source_file.values
                         ),
                         limit=config.max_variables_per_file,

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/architecture/shape/services/import_resolver.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 
 from wireup import injectable
 
+from ....shared.code.models.import_crossing_type import ImportCrossingType
 from ...config.models.shape_rules import ShapeRules
 from ..domain import BaseShapeResolver, ShapeResolverInterface
 from ..models.shape_realm_architecture_map import ShapeRealmArchitectureMap
@@ -49,7 +50,7 @@ class ImportResolver(ShapeResolverInterface, BaseShapeResolver):
                 )
             if (
                 config.require_joined_imports
-                and source_import.crossing_type != "module"
+                and source_import.crossing_type is not ImportCrossingType.MODULE
                 and (not source_import.uses_joined_import)
             ):
                 violations.append(

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

@@ -11,6 +11,7 @@ from ...extraction.extractors.models.extraction_request import ExtractionRequest
 from ...shared.code.models.code_map import CodeMap
 from ...shared.code.models.duplicate_identity_error import DuplicateIdentityError
 from ...shared.code.models.identity import FileId, ModuleId
+from ...shared.code.models.identity_kind import IdentityKind
 from ...shared.code.models.scan_policy import ScanPolicy
 from ...shared.code.models.source_extraction import SourceExtraction
 from ...shared.code.models.source_file import SourceFile
@@ -103,7 +104,7 @@ class CacheApplication:
         for file_id, source_file in ordered_files.items():
             existing = modules.get(source_file.module_id)
             if existing is not None:
-                raise DuplicateIdentityError("module", source_file.module_id, existing, file_id)
+                raise DuplicateIdentityError(IdentityKind.MODULE, source_file.module_id, existing, file_id)
             modules[source_file.module_id] = file_id
 
         extraction = SourceExtraction(

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/cli/cache/services/cache_identity.py

@@ -98,7 +98,9 @@ class CacheIdentity:
 
     def runtime_identity(self, request: ExtractionRequest, observation: RuntimeObservation) -> dict[str, object]:
         return {
-            "runtime": request.runtime.model_dump(mode="json"),
+            "descriptor": request.runtime.descriptor.model_dump(mode="json"),
+            "capabilities": [item.model_dump(mode="json") for item in request.runtime.capabilities],
+            "file_extensions": list(request.runtime.file_extensions),
             "batch": request.batch_config.model_dump(mode="json"),
             "observation": observation.model_dump(mode="json"),
         }

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

@@ -22,6 +22,7 @@ from .cache.models.cached_result import CachedResult
 from .documentation.application import DocumentationApplication
 from .initialization.application import InitializationApplication
 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
 
@@ -130,14 +131,14 @@ class CliFacade:
 
     def run(self, argv: Sequence[str]) -> int:
         request = self.parse(argv)
-        if request.command == "init":
+        if request.command is CommandName.INIT:
             return self.initialize(self.working_directory(), str(request.dot_dir), request.force)
         cache_options = CacheOptions(
             directory=str(request.cache_directory),
             namespace=request.cache_namespace,
             max_bytes=request.cache_max_bytes,
         )
-        if request.command == "cache-clear":
+        if request.command is CommandName.CACHE_CLEAR:
             self.clear_cache(cache_options)
             return 0
         config = self.load_configuration(str(request.dot_dir))

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/cli/initialization/application.py

@@ -18,19 +18,21 @@ class InitializationApplication:
 
     def initialize(self, project_root: Path, dot_dir: Path, force: bool) -> int:
         try:
-            outcomes: list[tuple[str, Path]] = []
+            created: list[Path] = []
+            preserved: list[Path] = []
+            overwritten: list[Path] = []
             for asset in self.resources.assets():
                 target = self.service.target(project_root, dot_dir, asset)
                 existed = target.exists()
                 if existed and not force:
-                    outcomes.append(("preserved", target))
+                    preserved.append(target)
                     continue
                 self.service.write(target, self.resources.content(asset.source))
-                outcomes.append(("overwritten" if existed else "created", target))
+                (overwritten if existed else created).append(target)
             result = InitializationResult(
-                created=tuple(path for action, path in outcomes if action == "created"),
-                preserved=tuple(path for action, path in outcomes if action == "preserved"),
-                overwritten=tuple(path for action, path in outcomes if action == "overwritten"),
+                created=tuple(created),
+                preserved=tuple(preserved),
+                overwritten=tuple(overwritten),
             )
         except (OSError, ValueError) as error:
             self.console.print(f"Initialization failed: {error}", style="red", markup=False)

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/cli/initialization/services/initialization_service.py

@@ -4,6 +4,7 @@ from pathlib import Path
 from wireup import injectable
 
 from ...resources.models.init_asset import InitAsset
+from ...resources.models.init_target_base import InitTargetBase
 
 
 @injectable
@@ -11,7 +12,10 @@ from ...resources.models.init_asset import InitAsset
 class InitializationService:
     def target(self, project_root: Path, dot_dir: Path, asset: InitAsset) -> Path:
         root = project_root.resolve()
-        bases = {"project": root, "dot_dir": self._resolve_within(root, root, dot_dir)}
+        bases = {
+            InitTargetBase.PROJECT: root,
+            InitTargetBase.DOT_DIR: self._resolve_within(root, root, dot_dir),
+        }
         return self._resolve_within(root, bases[asset.target_base], asset.target)
 
     def write(self, target: Path, content: str) -> None:

modwire-11.0.3/src/modwire/cli/pipeline/models/command_name.py

@@ -0,0 +1,7 @@
+from enum import StrEnum
+
+
+class CommandName(StrEnum):
+    INIT = "init"
+    REPORT = "report"
+    CACHE_CLEAR = "cache-clear"

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/cli/pipeline/models/command_request.py

@@ -1,11 +1,11 @@
 from pathlib import Path
-from typing import Literal
 
 from ....shared.values.models.value_model import ValueModel
+from .command_name import CommandName
 
 
 class CommandRequest(ValueModel):
-    command: Literal["init", "report", "cache-clear"]
+    command: CommandName
     dot_dir: Path
     architecture_root: Path = Path(".")
     language: str = ""

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/cli/pipeline/services/batch_source_reader.py

@@ -12,12 +12,14 @@ from pathlib import Path
 
 from wireup import injectable
 
+from ....extraction.extractors.models.batch_output_format import BatchOutputFormat
 from ....extraction.extractors.models.extraction_request import ExtractionRequest
 from ....extraction.extractors.models.extractor_runtime import ExtractorRuntime
 from ....shared.code.application import CodeApplication
 from ....shared.code.domain import PathMatcher
 from ....shared.code.models.duplicate_identity_error import DuplicateIdentityError
 from ....shared.code.models.identity import FileId, ModuleId
+from ....shared.code.models.identity_kind import IdentityKind
 from ....shared.code.models.scan_policy import ScanPolicy
 from ....shared.code.models.source_extraction import SourceExtraction
 from ....shared.code.models.source_file import SourceFile
@@ -62,7 +64,7 @@ class BatchSourceReader(SourceReader):
         for file_id, source_file in files.items():
             existing = modules.get(source_file.module_id)
             if existing is not None:
-                raise DuplicateIdentityError("module", source_file.module_id, existing, file_id)
+                raise DuplicateIdentityError(IdentityKind.MODULE, source_file.module_id, existing, file_id)
             modules[source_file.module_id] = file_id
         return SourceExtraction(
             files=files,
@@ -174,7 +176,7 @@ class BatchSourceReader(SourceReader):
         if not source_paths:
             return {}
         runtime = request.runtime
-        entrypoint = runtime.resources.entrypoint
+        entrypoint = runtime.entrypoint
         script_path = Path(str(resources.files(entrypoint.package).joinpath(entrypoint.path)))
         if not script_path.is_file():
             raise RuntimeError(f"{runtime.descriptor.language} extractor script is missing: {script_path}")
@@ -182,7 +184,7 @@ class BatchSourceReader(SourceReader):
             self.code.file_id(str(root), str(source_path)): str(source_path) for source_path in source_paths
         }
         command = [*runtime.command, str(script_path), "--batch", str(root)]
-        if request.batch_config.output_format == "jsonl":
+        if request.batch_config.output_format is BatchOutputFormat.JSON_LINES:
             command.append("--jsonl")
         completed = subprocess.run(
             command, input=json.dumps(paths_by_source_id), text=True, capture_output=True, check=False
@@ -209,7 +211,7 @@ class BatchSourceReader(SourceReader):
     def _merge_files(self, files: dict[FileId, SourceFile], extracted: dict[FileId, SourceFile]) -> None:
         for file_id, source_file in extracted.items():
             if file_id in files:
-                raise DuplicateIdentityError("file", file_id, file_id, file_id)
+                raise DuplicateIdentityError(IdentityKind.FILE, file_id, file_id, file_id)
             files[file_id] = source_file
 
     def _source_id_for_path(self, request: ExtractionRequest, root: Path, path: Path) -> FileId:

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/cli/pipeline/services/command_line.py

@@ -5,6 +5,7 @@ from pathlib import Path
 
 from wireup import injectable
 
+from ..models.command_name import CommandName
 from ..models.command_request import CommandRequest
 
 
@@ -18,24 +19,24 @@ class CommandLine:
     def _parser(self) -> argparse.ArgumentParser:
         parser = argparse.ArgumentParser()
         commands = parser.add_subparsers(dest="command", required=True)
-        init = commands.add_parser("init", help="Create project-local Modwire configuration.")
+        init = commands.add_parser(CommandName.INIT, help="Create project-local Modwire configuration.")
         init.add_argument("--dot-dir", type=Path, default=Path(".modwire"))
         init.add_argument("--force", action="store_true", help="Replace existing generated assets.")
-        report = commands.add_parser("report", help="Run architecture reports.")
+        report = commands.add_parser(CommandName.REPORT, help="Run architecture reports.")
         report.add_argument("--dot-dir", type=Path, default=Path(".modwire"))
         report.add_argument("--architecture-root", type=Path, default=Path("."))
         report.add_argument("--language", required=True)
         report.add_argument("--summary", action="store_true", help="Render modules without individual files.")
         self._cache_arguments(report)
         report.add_argument("--no-cache", action="store_true", help="Run without persistent cache reuse.")
-        clear = commands.add_parser("cache-clear", help="Clear one Modwire cache namespace safely.")
+        clear = commands.add_parser(CommandName.CACHE_CLEAR, help="Clear one Modwire cache namespace safely.")
         clear.add_argument("--dot-dir", type=Path, default=Path(".modwire"))
         self._cache_arguments(clear)
         return parser
 
     def _legacy_report_arguments(self, argv: Sequence[str]) -> Sequence[str]:
-        command_names = {"init", "report", "cache-clear", "-h", "--help"}
-        return ("report", *argv) if argv and argv[0] not in command_names else argv
+        command_names = {*CommandName, "-h", "--help"}
+        return (CommandName.REPORT, *argv) if argv and argv[0] not in command_names else argv
 
     def _cache_arguments(self, parser: argparse.ArgumentParser) -> None:
         parser.add_argument("--cache-directory", type=Path, default=Path(".modwire/cache"))

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/cli/pipeline/services/source_manifest_builder.py

@@ -7,6 +7,7 @@ from importlib import resources
 from wireup import injectable
 
 from ....extraction.extractors.models.extraction_request import ExtractionRequest
+from ....shared.code.models.digest_algorithm import DigestAlgorithm
 from ....shared.code.models.runtime_observation import RuntimeObservation
 from ....shared.code.models.scan_policy import ScanPolicy
 from ....shared.code.models.source_manifest import SourceManifest
@@ -35,7 +36,7 @@ class SourceManifestBuilder:
             policy=policy,
             runtime=runtime,
             sources=sources,
-            digest_algorithm="sha256",
+            digest_algorithm=DigestAlgorithm.SHA256,
             digest=hashlib.sha256(serialized).hexdigest(),
         )
 
@@ -50,14 +51,8 @@ class SourceManifestBuilder:
         version = completed.stdout.strip()
         if not version:
             raise RuntimeError(f"{runtime.descriptor.language} runtime returned an empty version.")
-        digest = hashlib.sha256()
-        for resource in runtime.resources.identity_resources:
-            digest.update(resource.package.encode("utf-8"))
-            digest.update(b"\x00")
-            digest.update(resource.path.encode("utf-8"))
-            digest.update(b"\x00")
-            digest.update(resources.files(resource.package).joinpath(resource.path).read_bytes())
-            digest.update(b"\x00")
+        entrypoint = runtime.entrypoint
+        digest = hashlib.sha256(resources.files(entrypoint.package).joinpath(entrypoint.path).read_bytes())
         return RuntimeObservation(
             version=version,
             resource_digest=digest.hexdigest(),

modwire-11.0.3/src/modwire/cli/resources/models/defaults.py

@@ -0,0 +1,15 @@
+from pathlib import Path
+
+from .init_asset import InitAsset
+from .init_target_base import InitTargetBase
+
+DEFAULT_INIT_ASSETS = (
+    InitAsset(source="ARCHITECTURE.md", target_base=InitTargetBase.DOT_DIR, target=Path("docs/ARCHITECTURE.md")),
+    InitAsset(source="architecture.yaml", target_base=InitTargetBase.DOT_DIR, target=Path("architecture.yaml")),
+    InitAsset(source="INDEX.md", target_base=InitTargetBase.DOT_DIR, target=Path("INDEX.md")),
+    InitAsset(source="MODWIRE.md", target_base=InitTargetBase.DOT_DIR, target=Path("docs/MODWIRE.md")),
+    InitAsset(source="RULES.md", target_base=InitTargetBase.DOT_DIR, target=Path("docs/RULES.md")),
+    InitAsset(source="TESTING.md", target_base=InitTargetBase.DOT_DIR, target=Path("docs/TESTING.md")),
+    InitAsset(source="WORKFLOW.md", target_base=InitTargetBase.DOT_DIR, target=Path("docs/WORKFLOW.md")),
+    InitAsset(source="AGENTS.md", target_base=InitTargetBase.PROJECT, target=Path("AGENTS.md")),
+)

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/cli/resources/models/init_asset.py

@@ -1,10 +1,10 @@
 from pathlib import Path
-from typing import Literal
 
 from ....shared.values.models.value_model import ValueModel
+from .init_target_base import InitTargetBase
 
 
 class InitAsset(ValueModel):
     source: str
-    target_base: Literal["project", "dot_dir"]
+    target_base: InitTargetBase
     target: Path

modwire-11.0.3/src/modwire/cli/resources/models/init_target_base.py

@@ -0,0 +1,6 @@
+from enum import StrEnum
+
+
+class InitTargetBase(StrEnum):
+    PROJECT = "project"
+    DOT_DIR = "dot_dir"

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/extraction/dependency/services/import_resolver.py

@@ -4,6 +4,8 @@ from dataclasses import dataclass
 from wireup import injectable
 
 from ....shared.code.models.identity import FileId, ModuleId
+from ....shared.code.models.import_crossing_type import ImportCrossingType
+from ....shared.code.models.source_dependency_resolution import SourceDependencyResolution
 from ....shared.code.models.source_file import SourceFile
 from ....shared.code.models.source_import import SourceImport
 from ..domain import ImportResolver
@@ -39,10 +41,19 @@ class SourceImportResolver(ImportResolver):
     ) -> SourceImport:
         candidates = self._candidates(imported, modules, symbols)
         if len(candidates) == 1:
-            return imported.model_copy(update={"resolution": "resolved", "target_file_id": next(iter(candidates))})
+            return imported.model_copy(
+                update={
+                    "resolution": SourceDependencyResolution.RESOLVED,
+                    "target_file_id": next(iter(candidates)),
+                }
+            )
         return imported.model_copy(
             update={
-                "resolution": "unresolved" if candidates or imported.is_relative else "external",
+                "resolution": (
+                    SourceDependencyResolution.UNRESOLVED
+                    if candidates or imported.is_relative
+                    else SourceDependencyResolution.EXTERNAL
+                ),
                 "target_file_id": None,
             }
         )
@@ -54,7 +65,7 @@ class SourceImportResolver(ImportResolver):
         candidates = modules.exact("", specifier)
         if candidates:
             return candidates
-        if imported.crossing_type == "symbol" and imported.imported_symbols:
+        if imported.crossing_type is ImportCrossingType.SYMBOL and imported.imported_symbols:
             symbol_names = {symbol.name.casefold() for symbol in imported.imported_symbols}
             imported_parent = self._normalize(imported.join_key)
             for symbol_name in symbol_names:
@@ -64,7 +75,7 @@ class SourceImportResolver(ImportResolver):
         candidates = modules.suffix("", specifier)
         if candidates:
             return candidates
-        if imported.crossing_type == "symbol" and imported.imported_symbols:
+        if imported.crossing_type is ImportCrossingType.SYMBOL and imported.imported_symbols:
             symbol_names = {symbol.name.casefold() for symbol in imported.imported_symbols}
             imported_parent = self._normalize(imported.join_key)
             for symbol_name in symbol_names:

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/extraction/extractors/models/batch_config.py

@@ -1,6 +1,5 @@
-from typing import Literal
-
 from ....shared.values.models.value_model import ValueModel
+from .batch_output_format import BatchOutputFormat
 
 
 class BatchConfig(ValueModel):
@@ -8,5 +7,5 @@ class BatchConfig(ValueModel):
     parallel_threshold: int = 0
     parallel_size: int = 0
     max_workers: int = 1
-    output_format: Literal["json", "jsonl"] = "json"
+    output_format: BatchOutputFormat = BatchOutputFormat.JSON
     planner: str = "fixed"

modwire-11.0.3/src/modwire/extraction/extractors/models/batch_output_format.py

@@ -0,0 +1,6 @@
+from enum import StrEnum
+
+
+class BatchOutputFormat(StrEnum):
+    JSON = "json"
+    JSON_LINES = "jsonl"

{modwire-11.0.2 → modwire-11.0.3}/src/modwire/extraction/extractors/models/extractor_runtime.py

@@ -1,7 +1,7 @@
 from ....shared.code.models.capability_coverage import CapabilityCoverage
 from ....shared.code.models.extractor_descriptor import ExtractorDescriptor
 from ....shared.values.models.value_model import ValueModel
-from .extractor_resource_set import ExtractorResourceSet
+from .extractor_resource import ExtractorResource
 
 
 class ExtractorRuntime(ValueModel):
@@ -11,4 +11,4 @@ class ExtractorRuntime(ValueModel):
     file_extensions: tuple[str, ...]
     command: tuple[str, ...]
     version_arguments: tuple[str, ...]
-    resources: ExtractorResourceSet
+    entrypoint: ExtractorResource