@lamentis/naome 1.3.14 → 1.3.16

package/crates/naome-core/src/quality/analysis_model.rs

@@ -0,0 +1,33 @@
+use std::collections::HashSet;
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct FileAnalysis {
+    pub path: String,
+    pub line_count: usize,
+    pub added_lines: usize,
+    pub raw_lines: Vec<String>,
+    pub normalized_lines: Vec<NormalizedLine>,
+    pub symbols: Vec<SymbolAnalysis>,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct NormalizedLine {
+    pub line_number: usize,
+    pub value: String,
+}
+
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+pub struct SymbolAnalysis {
+    pub kind: String,
+    pub name: String,
+    pub start_line: usize,
+    pub end_line: usize,
+    pub indent: usize,
+    pub tokens: HashSet<String>,
+}
+
+impl SymbolAnalysis {
+    pub fn line_count(&self) -> usize {
+        self.end_line.saturating_sub(self.start_line) + 1
+    }
+}

package/crates/naome-core/src/quality/cache.rs

@@ -7,7 +7,7 @@ use sha2::{Digest, Sha256};
 
 use crate::models::NaomeError;
 
-use super::scanner::FileAnalysis;
+use super::analysis_model::FileAnalysis;
 use super::types::RepositoryQualityConfig;
 
 const CACHE_RELATIVE_PATH: &str = ".naome/cache/quality";

package/crates/naome-core/src/quality/checks/duplicate_blocks.rs

@@ -2,7 +2,8 @@ use std::collections::{HashMap, HashSet};
 
 use sha2::{Digest, Sha256};
 
-use super::super::scanner::{stable_fingerprint, NormalizedLine, QualityContext};
+use super::super::analysis_model::NormalizedLine;
+use super::super::scanner::{stable_fingerprint, QualityContext};
 use super::super::types::QualityViolation;
 use super::{is_code_like_path, QualityCheck};
 

package/crates/naome-core/src/quality/checks/near_duplicates.rs

@@ -1,6 +1,7 @@
 use std::collections::HashSet;
 
-use super::super::scanner::{FileAnalysis, QualityContext, SymbolAnalysis};
+use super::super::analysis_model::{FileAnalysis, SymbolAnalysis};
+use super::super::scanner::QualityContext;
 use super::super::types::QualityViolation;
 use super::{is_code_like_path, violation, QualityCheck};
 

package/crates/naome-core/src/quality/mod.rs

@@ -1,6 +1,7 @@
 mod adapter_ios;
 mod adapter_support;
 mod adapters;
+mod analysis_model;
 mod baseline;
 mod cache;
 mod checks;

package/crates/naome-core/src/quality/scanner/analysis.rs

@@ -4,7 +4,7 @@ use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::path::Path;
 
-use super::{FileAnalysis, NormalizedLine, SymbolAnalysis};
+use crate::quality::analysis_model::{FileAnalysis, NormalizedLine, SymbolAnalysis};
 use crate::quality::cache::{content_hash, QualityCache};
 use normalize::{normalize_line, token_set};
 

package/crates/naome-core/src/quality/scanner.rs

@@ -11,6 +11,7 @@ use crate::{git, models::NaomeError, paths};
 pub(crate) use repo_paths::collect_repo_paths;
 use repo_paths::{added_lines_by_path, regular_repo_file_path, tracked_blob_hashes};
 
+use super::analysis_model::FileAnalysis;
 use super::cache::QualityCache;
 use super::types::{
     default_generated_paths, default_ignored_paths, QualityLimits, QualityMode,
@@ -55,38 +56,6 @@ impl QualityContext {
     }
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct FileAnalysis {
-    pub path: String,
-    pub line_count: usize,
-    pub added_lines: usize,
-    pub raw_lines: Vec<String>,
-    pub normalized_lines: Vec<NormalizedLine>,
-    pub symbols: Vec<SymbolAnalysis>,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct NormalizedLine {
-    pub line_number: usize,
-    pub value: String,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct SymbolAnalysis {
-    pub kind: String,
-    pub name: String,
-    pub start_line: usize,
-    pub end_line: usize,
-    pub indent: usize,
-    pub tokens: HashSet<String>,
-}
-
-impl SymbolAnalysis {
-    pub fn line_count(&self) -> usize {
-        self.end_line.saturating_sub(self.start_line) + 1
-    }
-}
-
 pub fn scan_repository(
     root: &Path,
     mode: QualityMode,

package/crates/naome-core/src/quality/semantic/extract.rs

@@ -1,7 +1,8 @@
 use std::collections::BTreeSet;
 
 use super::model::ObjectCandidate;
-use crate::quality::scanner::{stable_fingerprint, FileAnalysis, SymbolAnalysis};
+use crate::quality::analysis_model::{FileAnalysis, SymbolAnalysis};
+use crate::quality::scanner::stable_fingerprint;
 
 pub(super) fn extract_object_candidates(file: &FileAnalysis) -> Vec<ObjectCandidate> {
     let mut candidates = Vec::new();

package/crates/naome-core/src/quality/structure/adapter_ios.rs

@@ -4,7 +4,7 @@ use crate::quality::adapter_support::{
     detects_swiftui_project, detects_xcode_project, detects_xctest_project,
 };
 
-use super::adapters::StructureAdapter;
+use super::adapter_model::StructureAdapter;
 
 pub(super) fn adapters() -> Vec<StructureAdapter> {
     let mut adapters = Vec::new();

package/crates/naome-core/src/quality/structure/adapter_model.rs

@@ -0,0 +1,23 @@
+use crate::quality::adapter_support::{AdapterDescriptor, RepoSignals};
+
+#[derive(Clone, Copy)]
+pub(super) struct StructureAdapter {
+    pub(super) id: &'static str,
+    pub(super) detect: fn(&RepoSignals<'_>) -> bool,
+    pub(super) source_roots: &'static [&'static str],
+    pub(super) test_roots: &'static [&'static str],
+    pub(super) generated_roots: &'static [&'static str],
+    pub(super) artifact_roots: &'static [&'static str],
+    pub(super) module_roots: &'static [&'static str],
+    pub(super) allowed_root_files: &'static [&'static str],
+}
+
+impl AdapterDescriptor for StructureAdapter {
+    fn id(&self) -> &'static str {
+        self.id
+    }
+
+    fn detects(&self, signals: &RepoSignals<'_>) -> bool {
+        (self.detect)(signals)
+    }
+}

package/crates/naome-core/src/quality/structure/adapters.rs

@@ -2,36 +2,15 @@ use crate::models::NaomeError;
 
 use crate::quality::adapter_support::{
     detected_ids, detects_javascript_typescript_project, detects_rust_project, extend_unique,
-    find_adapter_by_id, validate_ids, AdapterDescriptor, RepoSignals,
+    find_adapter_by_id, validate_ids,
 };
 
 use super::adapter_ios;
+use super::adapter_model::StructureAdapter;
 use super::model::RepositoryStructureConfig;
 
 const CONFIG_PATH: &str = ".naome/repository-structure.json";
 
-#[derive(Clone, Copy)]
-pub(super) struct StructureAdapter {
-    pub(super) id: &'static str,
-    pub(super) detect: fn(&RepoSignals<'_>) -> bool,
-    pub(super) source_roots: &'static [&'static str],
-    pub(super) test_roots: &'static [&'static str],
-    pub(super) generated_roots: &'static [&'static str],
-    pub(super) artifact_roots: &'static [&'static str],
-    pub(super) module_roots: &'static [&'static str],
-    pub(super) allowed_root_files: &'static [&'static str],
-}
-
-impl AdapterDescriptor for StructureAdapter {
-    fn id(&self) -> &'static str {
-        self.id
-    }
-
-    fn detects(&self, signals: &RepoSignals<'_>) -> bool {
-        (self.detect)(signals)
-    }
-}
-
 pub fn detected_structure_adapter_ids(paths: &[String]) -> Vec<String> {
     let registry = registry();
     detected_ids(paths, &registry)

package/crates/naome-core/src/quality/structure/config.rs

@@ -8,6 +8,7 @@ use super::adapters::{
 };
 use crate::quality::config_support::validate_ready_schema;
 
+use super::defaults::default_structure_config;
 use super::model::RepositoryStructureConfig;
 
 const CONFIG_RELATIVE_PATH: &str = ".naome/repository-structure.json";
@@ -68,7 +69,7 @@ pub fn write_default_structure_config_if_missing(
 }
 
 fn generated_structure_config(paths: &[String]) -> RepositoryStructureConfig {
-    let mut config = RepositoryStructureConfig::default();
+    let mut config = default_structure_config();
     config.enabled_adapters = detected_structure_adapter_ids(paths);
     config
 }

package/crates/naome-core/src/quality/structure/defaults.rs

@@ -24,11 +24,11 @@ pub fn default_structure_config() -> RepositoryStructureConfig {
 }
 
 pub fn default_changed_policy() -> String {
-    "block".to_string()
+    super::model::default_changed_policy()
 }
 
 pub fn default_debt_policy() -> String {
-    "report".to_string()
+    super::model::default_debt_policy()
 }
 
 const DEFAULT_SOURCE_ROOTS: &[&str] = &[

package/crates/naome-core/src/quality/structure/mod.rs

@@ -1,4 +1,5 @@
 mod adapter_ios;
+mod adapter_model;
 mod adapters;
 mod checks;
 mod classify;

package/crates/naome-core/src/quality/structure/model.rs

@@ -2,8 +2,6 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use serde::{Deserialize, Serialize};
 
-use super::defaults::{default_changed_policy, default_debt_policy, default_structure_config};
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct StructureLimits {
@@ -81,10 +79,12 @@ pub struct RepositoryStructureConfig {
     pub limits: StructureLimits,
 }
 
-impl Default for RepositoryStructureConfig {
-    fn default() -> Self {
-        default_structure_config()
-    }
+pub(super) fn default_changed_policy() -> String {
+    "block".to_string()
+}
+
+pub(super) fn default_debt_policy() -> String {
+    "report".to_string()
 }
 
 #[derive(Debug, Clone, Serialize)]

package/crates/naome-core/src/repository_model.rs

@@ -125,7 +125,12 @@ fn model_evidence_paths(model: &RepositoryModel) -> Vec<String> {
         .iter()
         .flat_map(|fact| fact.evidence.iter())
         .chain(model.roots.iter().flat_map(|root| root.evidence.iter()))
-        .chain(model.entities.iter().flat_map(|entity| entity.evidence.iter()))
+        .chain(
+            model
+                .entities
+                .iter()
+                .flat_map(|entity| entity.evidence.iter()),
+        )
         .chain(model.path_facts.iter().map(|fact| &fact.path))
         .chain(
             model

package/crates/naome-core/src/route/builtin_checks.rs

@@ -4,7 +4,7 @@ use crate::harness_health::{validate_harness_health, HarnessHealthOptions};
 use crate::models::NaomeError;
 use crate::quality::{check_repository_quality, check_semantic_legacy, QualityMode};
 use crate::route::git_ops::{command_output, git_output};
-use crate::route::quality_gate::QualityCheck;
+use crate::route::quality_gate_config::QualityCheck;
 use crate::task_state::{validate_task_state, TaskStateMode, TaskStateOptions};
 use crate::verification_contract::validate_verification_contract;
 

package/crates/naome-core/src/route/builtin_require.rs

@@ -1,6 +1,6 @@
 use crate::models::NaomeError;
 
-use super::quality_gate::QualityCheck;
+use super::quality_gate_config::QualityCheck;
 
 pub(super) fn require_builtin_quality_check_any(
     check_id: &str,

package/crates/naome-core/src/route/execution.rs

@@ -1,7 +1,6 @@
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use crate::intent::IntentDecision;
-use crate::journal::TaskJournalEntry;
 use crate::models::{Decision, NaomeError};
 
 use super::execution_baselines::{
@@ -9,41 +8,10 @@ use super::execution_baselines::{
     baseline_harness_refresh_then_completed_task, baseline_harness_refresh_then_worktree,
     baseline_pure_harness_refresh, baseline_setup, commit_upgrade_baseline,
 };
+use super::execution_model::RouteExecution;
 use super::execution_tasks::{
     commit_user_diff, create_task_worktree, journal_external_baseline_if_needed,
 };
-use super::RouteWorktree;
-
-pub(super) struct RouteExecution {
-    pub(super) mutation_performed: bool,
-    pub(super) executed_actions: Vec<String>,
-    pub(super) journal_entry: Option<TaskJournalEntry>,
-    pub(super) user_message: String,
-    pub(super) task_root: PathBuf,
-    pub(super) worktree: Option<RouteWorktree>,
-    pub(super) route_allowed: bool,
-    pub(super) human_options: Vec<String>,
-}
-
-impl RouteExecution {
-    pub(super) fn from_intent(root: &Path, intent: &IntentDecision) -> Self {
-        Self {
-            mutation_performed: false,
-            executed_actions: Vec::new(),
-            journal_entry: None,
-            user_message: intent.user_message.clone(),
-            task_root: root.to_path_buf(),
-            worktree: None,
-            route_allowed: intent.allowed,
-            human_options: intent.human_options.clone(),
-        }
-    }
-
-    pub(super) fn mark_action(&mut self, action: &str) {
-        self.mutation_performed = true;
-        self.executed_actions.push(action.to_string());
-    }
-}
 
 pub(super) fn execute_route_policy(
     root: &Path,

package/crates/naome-core/src/route/execution_baselines.rs

@@ -5,7 +5,7 @@ use crate::task_state::{
     completed_task_harness_refresh_diff, harness_refresh_diff, harness_refresh_with_unrelated_diff,
 };
 
-use super::execution::RouteExecution;
+use super::execution_model::RouteExecution;
 use super::execution_support::{commit_completed_task, commit_harness_paths, set_created_worktree};
 use super::git_ops::{git_add_all, git_commit, git_head};
 use super::worktree::{

package/crates/naome-core/src/route/execution_model.rs

@@ -0,0 +1,37 @@
+use std::path::{Path, PathBuf};
+
+use crate::intent::IntentDecision;
+use crate::journal::TaskJournalEntry;
+
+use super::RouteWorktree;
+
+pub(super) struct RouteExecution {
+    pub(super) mutation_performed: bool,
+    pub(super) executed_actions: Vec<String>,
+    pub(super) journal_entry: Option<TaskJournalEntry>,
+    pub(super) user_message: String,
+    pub(super) task_root: PathBuf,
+    pub(super) worktree: Option<RouteWorktree>,
+    pub(super) route_allowed: bool,
+    pub(super) human_options: Vec<String>,
+}
+
+impl RouteExecution {
+    pub(super) fn from_intent(root: &Path, intent: &IntentDecision) -> Self {
+        Self {
+            mutation_performed: false,
+            executed_actions: Vec::new(),
+            journal_entry: None,
+            user_message: intent.user_message.clone(),
+            task_root: root.to_path_buf(),
+            worktree: None,
+            route_allowed: intent.allowed,
+            human_options: intent.human_options.clone(),
+        }
+    }
+
+    pub(super) fn mark_action(&mut self, action: &str) {
+        self.mutation_performed = true;
+        self.executed_actions.push(action.to_string());
+    }
+}

package/crates/naome-core/src/route/execution_support.rs

@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 use crate::journal::append_task_journal;
 use crate::models::{Decision, NaomeError};
 
-use super::execution::RouteExecution;
+use super::execution_model::RouteExecution;
 use super::git_ops::{git_add_completed_task_paths, git_commit, git_head, git_stage_only_paths};
 use super::RouteWorktree;
 

package/crates/naome-core/src/route/execution_tasks.rs

@@ -4,7 +4,7 @@ use crate::git;
 use crate::journal::append_task_journal;
 use crate::models::{Decision, NaomeError};
 
-use super::execution::RouteExecution;
+use super::execution_model::RouteExecution;
 use super::execution_support::{initial_decision_completed, set_created_worktree};
 use super::git_ops::{git_commit, git_head, git_stage_only_paths};
 use super::quality_gate::run_user_diff_quality_gate;

package/crates/naome-core/src/route/quality_gate.rs

@@ -4,7 +4,6 @@ use crate::git;
 use crate::models::NaomeError;
 
 use super::builtin_checks::run_quality_check;
-pub(super) use super::quality_gate_config::QualityCheck;
 use super::quality_gate_config::{user_diff_check_ids, verification_checks};
 use super::quality_gate_snapshot::{
     changed_path_snapshot, read_head_verification, sorted_path_set,

package/crates/naome-core/src/route.rs

@@ -12,6 +12,7 @@ mod builtin_require;
 mod context;
 mod execution;
 mod execution_baselines;
+mod execution_model;
 mod execution_support;
 mod execution_tasks;
 mod git_ops;
@@ -26,7 +27,8 @@ use self::context::{
     can_create_task, discarded_actions, required_context_for_intent, required_context_for_route,
     winning_rule, would_mutate,
 };
-use self::execution::{execute_route_policy, RouteExecution};
+use self::execution::execute_route_policy;
+use self::execution_model::RouteExecution;
 
 const MAX_NAOME_TASK_WORKTREES: usize = 25;
 

package/crates/naome-core/src/task_state/api.rs

@@ -5,12 +5,13 @@ use serde_json::Value;
 use crate::models::NaomeError;
 use crate::task_ledger::{read_task_state_projection, validate_task_state_projection_is_current};
 
-use super::completion::{
-    validate_admission, validate_commit_gate, validate_complete_task, validate_progress,
-};
+use super::admission::validate_admission;
+use super::commit_gate::validate_commit_gate;
+use super::completion::validate_complete_task;
 use super::diff::validate_human_review_blocker_paths;
+use super::progress::validate_progress;
 use super::proof::validate_proof_evidence_covers_changed_paths;
-use super::reconcile::validate_push_gate;
+use super::push_gate::validate_push_gate;
 use super::shape::{
     format_blocker, validate_active_task, validate_active_task_references, validate_blocker,
     validate_idle_state, validate_pending_upgrade, validate_task_state_shape,

package/crates/naome-core/src/task_state/commit_gate.rs

@@ -7,7 +7,7 @@ use super::diff::task_diff_from_entries;
 use super::git_io::read_git_staged_changed_entries;
 use super::process_guard::{validate_no_active_processes, ProcessGate};
 use super::progress::{validate_init_complete, validate_upgrade_complete};
-use super::reconcile::{
+use super::repair::{
     is_deterministic_harness_refresh_diff, is_harness_repair_diff,
     is_install_or_upgrade_baseline_diff,
 };

package/crates/naome-core/src/task_state/compact_proof.rs

@@ -5,11 +5,11 @@ use serde_json::Value;
 
 use crate::models::NaomeError;
 
-use super::proof::{
+use super::evidence::{
     validate_control_state_paths, validate_evidence_array, validate_evidence_paths,
 };
-use super::proof_model::{CanonicalProof, VerificationDefaults};
 use super::proof_sources::read_path_sets;
+use super::proof_types::{CanonicalProof, VerificationDefaults};
 use super::util::{is_iso_datetime, require_string};
 
 pub(super) fn compact_proofs(

package/crates/naome-core/src/task_state/completed_refresh.rs

@@ -10,19 +10,6 @@ use super::types::{
     TaskStateMode, TaskStateOptions,
 };
 use super::util::{matches_any_pattern, string_array};
-pub(super) fn add_completed_task_diff_notice(
-    root: &Path,
-    notices: &mut Vec<String>,
-) -> Result<(), NaomeError> {
-    let changed_paths = read_git_changed_paths(root)?;
-    if changed_paths.is_empty() {
-        return Ok(());
-    }
-
-    notices.push(format!("Task is complete and verified. Changed paths: {}. NAOME intent can baseline it automatically before the next distinct task; only surface human choices when intent blocks or the user explicitly asks to review, revise, cancel, or commit.", changed_paths.join(", ")));
-    Ok(())
-}
-
 pub fn completed_task_harness_refresh_diff(
     root: &Path,
 ) -> Result<Option<CompletedTaskHarnessRefreshDiff>, NaomeError> {

package/crates/naome-core/src/task_state/completion.rs

@@ -3,14 +3,10 @@ use std::path::Path;
 
 use serde_json::Value;
 
-pub(super) use super::admission::validate_admission;
-pub(super) use super::commit_gate::validate_commit_gate;
 use super::diff::validate_changed_entries;
 use super::git_io::read_git_changed_entries;
 use super::process_guard::{validate_no_active_processes, ProcessGate};
-pub(super) use super::progress::validate_progress;
 use super::proof::{validate_proof_evidence_covers_changed_entries, validate_proof_results};
-use super::reconcile::add_completed_task_diff_notice;
 use super::shape::{read_verification_check_ids, validate_required_check_ids};
 use super::types::ChangedEntry;
 use crate::models::NaomeError;
@@ -58,6 +54,19 @@ pub(super) fn validate_complete_task(
     Ok(())
 }
 
+fn add_completed_task_diff_notice(
+    root: &Path,
+    notices: &mut Vec<String>,
+) -> Result<(), NaomeError> {
+    let changed_paths = super::git_io::read_git_changed_paths(root)?;
+    if changed_paths.is_empty() {
+        return Ok(());
+    }
+
+    notices.push(format!("Task is complete and verified. Changed paths: {}. NAOME intent can baseline it automatically before the next distinct task; only surface human choices when intent blocks or the user explicitly asks to review, revise, cancel, or commit.", changed_paths.join(", ")));
+    Ok(())
+}
+
 pub(super) fn validate_complete_task_against_entries(
     active_task: &Value,
     root: &Path,

package/crates/naome-core/src/task_state/mod.rs

@@ -18,8 +18,8 @@ mod proof;
 mod proof_entry;
 mod proof_model;
 mod proof_sources;
+mod proof_types;
 mod push_gate;
-mod reconcile;
 mod repair;
 mod shape;
 mod task_diff_api;

package/crates/naome-core/src/task_state/progress.rs

@@ -8,7 +8,7 @@ use crate::repository_model_drift;
 use super::diff::validate_changed_paths;
 use super::git_io::read_git_changed_paths;
 use super::human_review_state::validate_human_review_state;
-use super::reconcile::format_dirty_diff_admission_blocker;
+use super::push_gate::format_dirty_diff_admission_blocker;
 use super::shape::{
     format_blocker, validate_active_task, validate_active_task_references, validate_blocker,
     validate_pending_upgrade,

package/crates/naome-core/src/task_state/proof.rs

@@ -6,10 +6,7 @@ use serde_json::Value;
 use crate::models::NaomeError;
 
 use super::diff::task_diff_from_entries;
-pub(super) use super::evidence::{
-    evidence_entry_path, validate_control_state_paths, validate_control_state_patterns,
-    validate_evidence_array, validate_evidence_paths,
-};
+use super::evidence::evidence_entry_path;
 use super::git_io::read_git_changed_entries;
 use super::proof_entry::validate_proof_result;
 use super::proof_model::canonical_proofs;

package/crates/naome-core/src/task_state/proof_entry.rs

@@ -5,7 +5,7 @@ use serde_json::Value;
 
 use crate::models::NaomeError;
 
-use super::proof::{
+use super::evidence::{
     validate_control_state_paths, validate_evidence_array, validate_evidence_paths,
 };
 use super::util::{is_iso_datetime, require_string};

package/crates/naome-core/src/task_state/proof_model.rs

@@ -1,27 +1,11 @@
 use std::path::Path;
 
-use serde_json::Value;
-
 use crate::models::NaomeError;
 
 use super::compact_proof::compact_proofs;
 use super::proof_sources::{check_id_from_proof, read_verification_defaults};
-
-#[derive(Debug, Clone)]
-pub(crate) struct CanonicalProof {
-    pub(crate) check_id: String,
-    pub(crate) command: String,
-    pub(crate) cwd: String,
-    pub(crate) exit_code: i64,
-    pub(crate) checked_at: String,
-    pub(crate) evidence: Vec<Value>,
-}
-
-#[derive(Debug, Clone)]
-pub(super) struct VerificationDefaults {
-    pub(super) command: String,
-    pub(super) cwd: String,
-}
+use super::proof_types::CanonicalProof;
+use serde_json::Value;
 
 pub(crate) fn canonical_proofs(
     active_task: &Value,

package/crates/naome-core/src/task_state/proof_sources.rs

@@ -5,10 +5,10 @@ use serde_json::Value;
 
 use crate::models::NaomeError;
 
-use super::proof::{
+use super::evidence::{
     validate_control_state_paths, validate_evidence_array, validate_evidence_paths,
 };
-use super::proof_model::VerificationDefaults;
+use super::proof_types::VerificationDefaults;
 use super::util::read_json;
 
 pub(super) fn read_path_sets(