@lamentis/naome 1.3.14 → 1.3.15

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(

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

@@ -0,0 +1,17 @@
+use serde_json::Value;
+
+#[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,
+}

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

@@ -1,6 +1,6 @@
 use serde_json::Value;
 
-use super::proof::validate_control_state_patterns;
+use super::evidence::validate_control_state_patterns;
 pub(super) use super::task_records::{
     format_blocker, validate_blocker, validate_human_review, validate_prompt_record,
     validate_revisions,

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

@@ -8,7 +8,7 @@ use crate::models::NaomeError;
 
 use super::completion::validate_complete_task_against_entries;
 use super::git_io::{read_git_changed_entries, read_git_changed_paths};
-use super::reconcile::{
+use super::repair::{
     is_packaged_machine_owned_path, is_repair_archive_path, is_safe_harness_refresh_path,
 };
 use super::shape::{

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

@@ -17,9 +17,7 @@ pub(crate) fn validate_semantic_quality_gate_policy(
     }
 
     for (index, change_type) in change_types.iter().enumerate() {
-        let Some(required_checks) = change_type
-            .get("requiredChecks")
-            .and_then(Value::as_array)
+        let Some(required_checks) = change_type.get("requiredChecks").and_then(Value::as_array)
         else {
             continue;
         };
@@ -46,7 +44,5 @@ pub(crate) fn validate_semantic_quality_gate_policy(
 }
 
 fn contains_string(values: &[Value], expected: &str) -> bool {
-    values
-        .iter()
-        .any(|value| value.as_str() == Some(expected))
+    values.iter().any(|value| value.as_str() == Some(expected))
 }

package/crates/naome-core/src/workflow/agent/proof.rs

@@ -4,7 +4,7 @@ use crate::models::NaomeError;
 
 use super::support::changed_paths;
 use crate::workflow::agent_types::ProofPlan;
-use crate::workflow::phases::{verification_phase_plan, CommandCheckResult};
+use crate::workflow::{verification_phase_plan, CommandCheckResult};
 
 pub fn proof_plan_for_task(
     root: &Path,

package/crates/naome-core/src/workflow/agent.rs

@@ -11,7 +11,7 @@ use std::path::Path;
 use crate::models::NaomeError;
 
 use super::agent_types::AgentRunPlan;
-use super::phases::CommandCheckResult;
+use super::phase_model::CommandCheckResult;
 
 pub use capability::repository_capability_graph;
 pub use context_delta::context_delta_report;

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

@@ -7,6 +7,7 @@ mod integrity_support;
 mod mutation;
 mod output;
 mod phase_inference;
+mod phase_model;
 mod phases;
 mod policy;
 mod processes;
@@ -25,7 +26,8 @@ pub use doctor::{doctor_report, DoctorReport, DoctorSection, RepositoryPolicySec
 pub use integrity::{refresh_integrity, IntegrityRefreshReport};
 pub use mutation::classify_mutations;
 pub use output::{summarize_command_output, CommandOutputSummary};
-pub use phases::{verification_phase_plan, CommandCheckResult, VerificationPhasePlan};
+pub use phase_model::CommandCheckResult;
+pub use phases::{verification_phase_plan, VerificationPhasePlan};
 pub use policy::{safe_rg_args, validate_read_boundaries, validate_search_command};
 pub use processes::{tracked_process_report, ProcessReport};
 pub use types::{MutationClassification, ReadActivity, WorkflowFinding};

package/crates/naome-core/src/workflow/phase_inference.rs

@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 
 use serde_json::Value;
 
-use super::phases::{CheckDefinition, PhaseDefinition};
+use super::phase_model::{CheckDefinition, PhaseDefinition};
 
 pub(super) fn infer_phases(
     verification: &Value,

package/crates/naome-core/src/workflow/phase_model.rs

@@ -0,0 +1,22 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CommandCheckResult {
+    pub check_id: String,
+    pub exit_code: i32,
+}
+
+#[derive(Debug, Clone)]
+pub(super) struct CheckDefinition {
+    pub(super) id: String,
+    pub(super) command: String,
+    pub(super) cost: String,
+}
+
+#[derive(Debug, Clone)]
+pub(super) struct PhaseDefinition {
+    pub(super) id: String,
+    pub(super) order: u32,
+    pub(super) check_ids: Vec<String>,
+}

package/crates/naome-core/src/workflow/phases.rs

@@ -8,13 +8,7 @@ use serde_json::Value;
 use crate::models::NaomeError;
 
 use super::phase_inference::infer_phases;
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CommandCheckResult {
-    pub check_id: String,
-    pub exit_code: i32,
-}
+use super::phase_model::{CheckDefinition, CommandCheckResult, PhaseDefinition};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -35,20 +29,6 @@ pub struct VerificationPhaseStatus {
     pub blocked_by: Vec<String>,
 }
 
-#[derive(Debug, Clone)]
-pub(super) struct CheckDefinition {
-    pub(super) id: String,
-    pub(super) command: String,
-    pub(super) cost: String,
-}
-
-#[derive(Debug, Clone)]
-pub(super) struct PhaseDefinition {
-    pub(super) id: String,
-    pub(super) order: u32,
-    pub(super) check_ids: Vec<String>,
-}
-
 pub fn verification_phase_plan(
     root: &Path,
     completed: &[CommandCheckResult],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lamentis/naome",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "description": "Native-first CLI for the NAOME agent harness.",
   "license": "Apache-2.0",
   "type": "module",

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

@@ -1,7 +0,0 @@
-pub(super) use super::completed_refresh::add_completed_task_diff_notice;
-pub(super) use super::push_gate::{format_dirty_diff_admission_blocker, validate_push_gate};
-pub(super) use super::repair::{
-    is_deterministic_harness_refresh_diff, is_harness_repair_diff,
-    is_install_or_upgrade_baseline_diff, is_packaged_machine_owned_path, is_repair_archive_path,
-    is_safe_harness_refresh_path,
-};