@lamentis/naome 1.3.12 → 1.3.14

package/Cargo.lock

@@ -76,7 +76,7 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "naome-cli"
-version = "1.3.12"
+version = "1.3.14"
 dependencies = [
  "naome-core",
  "serde_json",
@@ -84,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "naome-core"
-version = "1.3.12"
+version = "1.3.14"
 dependencies = [
  "serde",
  "serde_json",

package/crates/naome-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "naome-cli"
-version = "1.3.12"
+version = "1.3.14"
 edition.workspace = true
 license.workspace = true
 repository.workspace = true

package/crates/naome-cli/src/architecture_commands.rs

@@ -53,7 +53,7 @@ fn run_arch_explain(root: &Path, args: &[String]) -> Result<(), Box<dyn std::err
                 "layers": scan.config.layers.keys().collect::<Vec<_>>(),
                 "contexts": scan.config.contexts.keys().collect::<Vec<_>>(),
                 "rules": ARCHITECTURE_RULE_IDS,
-                "extractors": ["path", "typescript", "javascript", "rust", "python", "go"]
+                "extractors": ["path", "typescript", "javascript", "rust", "python", "go", "swift"]
             }))?
         );
     } else {

package/crates/naome-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "naome-core"
-version = "1.3.12"
+version = "1.3.14"
 edition.workspace = true
 license.workspace = true
 repository.workspace = true

package/crates/naome-core/src/architecture/output.rs

@@ -54,6 +54,8 @@ pub struct ArchitectureValidation {
     pub rules_executed: Vec<String>,
     pub changed_only_requested: bool,
     pub changed_only_degraded_to_full_scan: bool,
+    pub changed_only_mode: String,
+    pub changed_only_degradation_reason: Option<String>,
     pub violations: Vec<ArchitectureViolation>,
     #[serde(rename = "agent_feedback")]
     pub agent_feedback: Vec<ArchitectureAgentFeedback>,
@@ -134,7 +136,15 @@ pub fn format_architecture_validation(report: &ArchitectureValidation) -> String
     ];
 
     if report.changed_only_degraded_to_full_scan {
-        lines.push("changed-only requested: degraded to full scan for soundness".to_string());
+        let reason = report
+            .changed_only_degradation_reason
+            .as_deref()
+            .unwrap_or("soundness");
+        lines.push(format!(
+            "changed-only requested: degraded to full scan for soundness ({reason})"
+        ));
+    } else if report.changed_only_requested {
+        lines.push("changed-only requested: using incremental architecture cache".to_string());
     }
 
     for violation in report.violations.iter().take(10) {
@@ -152,12 +162,24 @@ pub fn format_architecture_validation(report: &ArchitectureValidation) -> String
 }
 
 pub fn format_architecture_scan(report: &ArchitectureScanReport) -> String {
-    format!(
+    let mut output = format!(
         "NAOME architecture scan\nfiles scanned: {}\ngraph nodes: {}\ngraph edges: {}\n",
         report.files_scanned,
         report.graph.nodes.len(),
         report.graph.edges.len()
-    )
+    );
+    if report.changed_only_degraded_to_full_scan {
+        let reason = report
+            .changed_only_degradation_reason
+            .as_deref()
+            .unwrap_or("soundness");
+        output.push_str(&format!(
+            "changed-only requested: degraded to full scan for soundness ({reason})\n"
+        ));
+    } else if report.changed_only_requested {
+        output.push_str("changed-only requested: using incremental architecture cache\n");
+    }
+    output
 }
 
 pub fn format_architecture_explain(scan: &ArchitectureScanReport) -> String {
@@ -176,7 +198,7 @@ pub fn format_architecture_explain(scan: &ArchitectureScanReport) -> String {
         .collect::<Vec<_>>()
         .join(", ");
     format!(
-        "NAOME Architecture Fitness\nrules: {}\nlayers: {}\ncontexts: {}\npath extractor: enabled for every repository\nimport extractors: typescript, javascript, rust, python, go\n",
+        "NAOME Architecture Fitness\nrules: {}\nlayers: {}\ncontexts: {}\npath extractor: enabled for every repository\nimport extractors: typescript, javascript, rust, python, go, swift\n",
         ARCHITECTURE_RULE_IDS.join(", "),
         empty_label(&layers),
         empty_label(&contexts)

package/crates/naome-core/src/architecture/rules/external.rs

@@ -73,6 +73,7 @@ fn is_standard_library_dependency(language: Option<&str>, package: &str) -> bool
         Some("javascript") | Some("typescript") => NODE_BUILTINS.contains(&root),
         Some("python") => PYTHON_STDLIB.contains(&root),
         Some("rust") => matches!(root, "std" | "core" | "alloc" | "proc_macro" | "test"),
+        Some("swift") => SWIFT_APPLE_FRAMEWORKS.contains(&root),
         _ => false,
     }
 }
@@ -183,3 +184,61 @@ const PYTHON_STDLIB: &[&str] = &[
     "xml",
     "zipfile",
 ];
+
+const SWIFT_APPLE_FRAMEWORKS: &[&str] = &[
+    "Accelerate",
+    "AppIntents",
+    "AppKit",
+    "ARKit",
+    "AVFoundation",
+    "CloudKit",
+    "Combine",
+    "CoreData",
+    "CoreFoundation",
+    "CoreBluetooth",
+    "CoreGraphics",
+    "CoreImage",
+    "CoreLocation",
+    "CoreML",
+    "CoreMotion",
+    "CoreNFC",
+    "CoreSpotlight",
+    "CoreTelephony",
+    "CoreText",
+    "CryptoKit",
+    "Dispatch",
+    "EventKit",
+    "Foundation",
+    "GameKit",
+    "HealthKit",
+    "LocalAuthentication",
+    "MapKit",
+    "MessageUI",
+    "Metal",
+    "MetalKit",
+    "NaturalLanguage",
+    "Network",
+    "Observation",
+    "PassKit",
+    "PencilKit",
+    "Photos",
+    "QuartzCore",
+    "RealityKit",
+    "SafariServices",
+    "SceneKit",
+    "Security",
+    "SpriteKit",
+    "StoreKit",
+    "Swift",
+    "SwiftData",
+    "SwiftUI",
+    "ThreadNetwork",
+    "UIKit",
+    "UniformTypeIdentifiers",
+    "UserNotifications",
+    "Vision",
+    "WatchKit",
+    "WebKit",
+    "WidgetKit",
+    "XCTest",
+];

package/crates/naome-core/src/architecture/rules.rs

@@ -55,6 +55,8 @@ pub fn validate_scan(scan: ArchitectureScanReport) -> ArchitectureValidation {
         rules_executed,
         changed_only_requested: scan.changed_only_requested,
         changed_only_degraded_to_full_scan: scan.changed_only_degraded_to_full_scan,
+        changed_only_mode: scan.changed_only_mode,
+        changed_only_degradation_reason: scan.changed_only_degradation_reason,
         violations,
         agent_feedback,
     }

package/crates/naome-core/src/architecture/scan/cache.rs

@@ -0,0 +1,145 @@
+use std::collections::{BTreeMap, BTreeSet};
+use std::fs;
+use std::path::Path;
+
+use serde::{Deserialize, Serialize};
+use sha2::{Digest, Sha256};
+
+use super::FileFact;
+use crate::models::NaomeError;
+
+const CACHE_SCHEMA: &str = "naome.architecture-cache.v1";
+const EXTRACTOR_VERSION: &str = "architecture-cache-v1.3.14";
+const CACHE_PATH: &str = ".naome/cache/architecture/cache.json";
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(super) struct ArchitectureCache {
+    pub schema: String,
+    pub extractor_version: String,
+    pub config_hash: String,
+    pub file_list_hash: String,
+    pub files: BTreeMap<String, CachedFileFact>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub(super) struct CachedFileFact {
+    pub content_hash: String,
+    pub fact: FileFact,
+}
+
+impl ArchitectureCache {
+    pub(super) fn is_compatible(&self, config_hash: &str, file_list_hash: &str) -> CacheStatus {
+        if self.schema != CACHE_SCHEMA || self.extractor_version != EXTRACTOR_VERSION {
+            return CacheStatus::Miss("cache_miss");
+        }
+        if self.config_hash != config_hash {
+            return CacheStatus::Miss("config_changed");
+        }
+        if self.file_list_hash != file_list_hash {
+            return CacheStatus::Miss("file_set_changed");
+        }
+        CacheStatus::Hit
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(super) enum CacheStatus {
+    Hit,
+    Miss(&'static str),
+}
+
+pub(super) fn read(root: &Path) -> Option<ArchitectureCache> {
+    let content = fs::read_to_string(root.join(CACHE_PATH)).ok()?;
+    serde_json::from_str(&content).ok()
+}
+
+pub(super) fn write(
+    root: &Path,
+    config_hash: String,
+    file_list_hash: String,
+    file_facts: &BTreeMap<String, FileFact>,
+) -> Result<(), NaomeError> {
+    let cache = ArchitectureCache {
+        schema: CACHE_SCHEMA.to_string(),
+        extractor_version: EXTRACTOR_VERSION.to_string(),
+        config_hash,
+        file_list_hash,
+        files: file_facts
+            .iter()
+            .filter_map(|(path, fact)| {
+                let content_hash = content_hash(root, path).ok()?;
+                Some((
+                    path.clone(),
+                    CachedFileFact {
+                        content_hash,
+                        fact: fact.clone(),
+                    },
+                ))
+            })
+            .collect(),
+    };
+    let path = root.join(CACHE_PATH);
+    if let Some(parent) = path.parent() {
+        fs::create_dir_all(parent)?;
+    }
+    fs::write(path, serde_json::to_string_pretty(&cache)?)?;
+    Ok(())
+}
+
+pub(super) fn config_hash(
+    root: &Path,
+    explicit_path: Option<&Path>,
+    default_content: &str,
+) -> Result<String, NaomeError> {
+    let path = explicit_path
+        .map(Path::to_path_buf)
+        .unwrap_or_else(|| root.join("naome.arch.yaml"));
+    let source = if path.exists() {
+        fs::read_to_string(&path)?
+    } else {
+        default_content.to_string()
+    };
+    let label = display_path(root, &path);
+    Ok(stable_hash([
+        b"architecture-config-v1".as_slice(),
+        label.as_bytes(),
+        source.as_bytes(),
+    ]))
+}
+
+pub(super) fn file_list_hash(files: &[String]) -> String {
+    let mut hasher = Sha256::new();
+    hasher.update(b"architecture-file-list-v1");
+    for path in files {
+        hasher.update([0]);
+        hasher.update(path.as_bytes());
+    }
+    format!("sha256:{:x}", hasher.finalize())
+}
+
+pub(super) fn content_hash(root: &Path, path: &str) -> Result<String, NaomeError> {
+    let bytes = fs::read(root.join(path))?;
+    Ok(stable_hash([b"architecture-file-v1".as_slice(), &bytes]))
+}
+
+pub(super) fn changed_set(changed_paths: &[String]) -> BTreeSet<String> {
+    changed_paths.iter().cloned().collect()
+}
+
+fn stable_hash<'a>(parts: impl IntoIterator<Item = &'a [u8]>) -> String {
+    let mut hasher = Sha256::new();
+    for part in parts {
+        hasher.update(part);
+        hasher.update([0]);
+    }
+    format!("sha256:{:x}", hasher.finalize())
+}
+
+fn display_path(root: &Path, path: &Path) -> String {
+    path.strip_prefix(root)
+        .unwrap_or(path)
+        .to_string_lossy()
+        .replace('\\', "/")
+}

package/crates/naome-core/src/architecture/scan/graph_builder.rs

@@ -5,7 +5,7 @@ use std::path::Path;
 use serde_json::json;
 
 use super::imports;
-use super::FileFact;
+use super::{FileFact, ManifestFact};
 use crate::architecture::config::ArchitectureConfig;
 use crate::architecture::model::{ArchitectureEdgeKind, ArchitectureGraph, ArchitectureNodeKind};
 
@@ -16,24 +16,48 @@ pub(super) fn build_path_graph(
     root: &Path,
     files: Vec<String>,
     config: &ArchitectureConfig,
+    manifests: &[ManifestFact],
 ) -> (ArchitectureGraph, BTreeMap<String, FileFact>) {
-    let mut graph = ArchitectureGraph::default();
     let mut file_facts = BTreeMap::new();
     let file_set = files.iter().cloned().collect::<BTreeSet<_>>();
+    for path in &files {
+        file_facts.insert(path.clone(), scan_file_fact(root, path, config, &file_set));
+    }
+    let graph = build_graph_from_facts(&files, &file_facts, config, manifests);
+    (graph, file_facts)
+}
+
+pub(super) fn scan_file_fact(
+    root: &Path,
+    path: &str,
+    config: &ArchitectureConfig,
+    file_set: &BTreeSet<String>,
+) -> FileFact {
+    let content = fs::read_to_string(root.join(path)).unwrap_or_default();
+    let mut fact = facts::file_fact(path, &content, config);
+    fact.imports = imports::extract_imports(root, path, &content, file_set);
+    fact
+}
+
+pub(super) fn build_graph_from_facts(
+    files: &[String],
+    file_facts: &BTreeMap<String, FileFact>,
+    config: &ArchitectureConfig,
+    manifests: &[ManifestFact],
+) -> ArchitectureGraph {
+    let mut graph = ArchitectureGraph::default();
+    let mut emitted_external_nodes = BTreeSet::new();
 
     push_repository_and_policy_nodes(&mut graph, config);
-    push_directories(&mut graph, &files);
+    push_directories(&mut graph, files);
+    push_manifests(&mut graph, manifests, &mut emitted_external_nodes);
 
-    for path in files {
-        let content = fs::read_to_string(root.join(&path)).unwrap_or_default();
-        let mut fact = facts::file_fact(&path, &content, config);
-        fact.imports = imports::extract_imports(root, &path, &content, &file_set);
+    for fact in file_facts.values() {
         push_file(&mut graph, &fact);
-        file_facts.insert(path, fact);
     }
 
-    push_imports(&mut graph, &file_facts);
-    (graph, file_facts)
+    push_imports(&mut graph, file_facts, &mut emitted_external_nodes);
+    graph
 }
 
 fn push_repository_and_policy_nodes(graph: &mut ArchitectureGraph, config: &ArchitectureConfig) {
@@ -121,44 +145,117 @@ fn push_file(graph: &mut ArchitectureGraph, fact: &FileFact) {
     push_membership_edges(graph, path, "context", &fact.contexts);
 }
 
-fn push_imports(graph: &mut ArchitectureGraph, file_facts: &BTreeMap<String, FileFact>) {
-    let mut emitted_target_nodes = BTreeSet::new();
+fn push_manifests(
+    graph: &mut ArchitectureGraph,
+    manifests: &[ManifestFact],
+    emitted_external_nodes: &mut BTreeSet<String>,
+) {
+    for manifest in manifests {
+        let package_id = manifest_package_id(manifest);
+        emit::push_node_with_metadata(
+            graph,
+            &package_id,
+            ArchitectureNodeKind::Package,
+            &manifest.package_name,
+            Some(manifest.path.clone()),
+            None,
+            manifest.confidence,
+            &manifest.extractor,
+            json!({
+                "path": manifest.path,
+                "ecosystem": manifest.ecosystem,
+                "packageName": manifest.package_name
+            }),
+        );
+        emit::push_edge(
+            graph,
+            facts::parent_node_id(&manifest.path)
+                .as_deref()
+                .unwrap_or("repository:."),
+            &package_id,
+            ArchitectureEdgeKind::Contains,
+            "contains",
+            Some(manifest.path.clone()),
+        );
+        for dependency in &manifest.dependencies {
+            let external_id = format!("external:{}", dependency.name);
+            push_external_node(
+                graph,
+                emitted_external_nodes,
+                &external_id,
+                &dependency.name,
+                dependency.confidence,
+                &manifest.extractor,
+                json!({
+                    "manifestPath": manifest.path,
+                    "ecosystem": manifest.ecosystem,
+                    "dependencyKind": dependency.dependency_kind,
+                    "version": dependency.version
+                }),
+            );
+            emit::push_edge_with_metadata(
+                graph,
+                &package_id,
+                &external_id,
+                ArchitectureEdgeKind::DependsOn,
+                "depends_on",
+                Some(manifest.path.clone()),
+                None,
+                None,
+                dependency.confidence,
+                &manifest.extractor,
+                json!({
+                    "specifier": dependency.name,
+                    "manifestPath": manifest.path,
+                    "dependencyKind": dependency.dependency_kind,
+                    "version": dependency.version
+                }),
+            );
+        }
+    }
+}
+
+fn manifest_package_id(manifest: &ManifestFact) -> String {
+    format!(
+        "package:{}:{}",
+        stable_fragment(&manifest.ecosystem),
+        stable_fragment(&manifest.path)
+    )
+}
+
+fn push_imports(
+    graph: &mut ArchitectureGraph,
+    file_facts: &BTreeMap<String, FileFact>,
+    emitted_external_nodes: &mut BTreeSet<String>,
+) {
     for fact in file_facts.values() {
         for import in &fact.imports {
             let target_id = match &import.target {
                 super::ImportTarget::File(path) => format!("file:{path}"),
                 super::ImportTarget::ExternalDependency(name) => {
                     let id = format!("external:{name}");
-                    if emitted_target_nodes.insert(id.clone()) {
-                        emit::push_node_with_metadata(
-                            graph,
-                            &id,
-                            ArchitectureNodeKind::ExternalDependency,
-                            name,
-                            None,
-                            None,
-                            import.confidence,
-                            &import.extractor,
-                            json!({ "specifier": import.specifier, "resolvedAs": "external" }),
-                        );
-                    }
+                    push_external_node(
+                        graph,
+                        emitted_external_nodes,
+                        &id,
+                        name,
+                        import.confidence,
+                        &import.extractor,
+                        json!({ "specifier": import.specifier, "resolvedAs": "external" }),
+                    );
                     id
                 }
                 super::ImportTarget::Unknown(specifier) => {
                     let id = format!("unknown-import:{}", stable_fragment(specifier));
-                    if emitted_target_nodes.insert(id.clone()) {
-                        emit::push_node_with_metadata(
-                            graph,
-                            &id,
-                            ArchitectureNodeKind::ExternalDependency,
-                            specifier,
-                            None,
-                            None,
-                            import.confidence,
-                            &import.extractor,
-                            json!({ "specifier": specifier, "resolvedAs": "unknown" }),
-                        );
-                    }
+                    push_external_node(
+                        graph,
+                        emitted_external_nodes,
+                        &id,
+                        specifier,
+                        import.confidence,
+                        &import.extractor,
+                        json!({ "specifier": specifier, "resolvedAs": "unknown" }),
+                    );
                     id
                 }
             };
@@ -179,6 +276,30 @@ fn push_imports(graph: &mut ArchitectureGraph, file_facts: &BTreeMap<String, Fil
     }
 }
 
+fn push_external_node(
+    graph: &mut ArchitectureGraph,
+    emitted_external_nodes: &mut BTreeSet<String>,
+    id: &str,
+    label: &str,
+    confidence: f32,
+    extractor: &str,
+    raw_origin: serde_json::Value,
+) {
+    if emitted_external_nodes.insert(id.to_string()) {
+        emit::push_node_with_metadata(
+            graph,
+            id,
+            ArchitectureNodeKind::ExternalDependency,
+            label,
+            None,
+            None,
+            confidence,
+            extractor,
+            raw_origin,
+        );
+    }
+}
+
 fn push_membership_edges(
     graph: &mut ArchitectureGraph,
     path: &str,

package/crates/naome-core/src/architecture/scan/imports/extractors/swift.rs

@@ -0,0 +1,48 @@
+use super::{is_comment_only, raw, RawImport};
+
+pub(super) fn extract(content: &str) -> Vec<RawImport> {
+    let mut imports = Vec::new();
+    for (index, line) in content.lines().enumerate() {
+        let trimmed = line.trim();
+        if is_comment_only(trimmed) {
+            continue;
+        }
+        let Some(import_value) = swift_import_value(trimmed) else {
+            continue;
+        };
+        if let Some(specifier) = swift_import_specifier(import_value) {
+            imports.push(raw(specifier, index, line, 0.88, "import:swift"));
+        }
+    }
+    imports
+}
+
+fn swift_import_value(line: &str) -> Option<&str> {
+    let mut remaining = line.trim();
+    while remaining.starts_with('@') {
+        let Some((_, after_attribute)) = remaining.split_once(' ') else {
+            return None;
+        };
+        remaining = after_attribute.trim_start();
+    }
+    remaining.strip_prefix("import ")
+}
+
+fn swift_import_specifier(value: &str) -> Option<String> {
+    let mut parts = value.split_whitespace();
+    let first = parts.next()?;
+    let module = if matches!(
+        first,
+        "class" | "struct" | "enum" | "protocol" | "func" | "var" | "typealias"
+    ) {
+        parts.next()?
+    } else {
+        first
+    };
+    module
+        .split('.')
+        .next()
+        .map(str::trim)
+        .filter(|value| !value.is_empty())
+        .map(ToString::to_string)
+}

package/crates/naome-core/src/architecture/scan/imports/extractors.rs

@@ -1,6 +1,8 @@
 use super::language_for_path;
 use crate::architecture::model::SourceRange;
 
+mod swift;
+
 #[derive(Debug, Clone)]
 pub(super) struct RawImport {
     pub specifier: String,
@@ -15,6 +17,7 @@ pub(super) fn extract_raw_imports(path: &str, content: &str) -> Vec<RawImport> {
         Some("rust") => extract_rust(content),
         Some("python") => extract_python(content),
         Some("go") => extract_go(content),
+        Some("swift") => swift::extract(content),
         _ => Vec::new(),
     }
 }