@lamentis/naome 1.2.0 → 1.2.1

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

@@ -0,0 +1,73 @@
+use std::path::Path;
+
+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,
+    validate_changed_text_whitespace,
+};
+
+pub(super) fn run_user_diff_quality_gate(
+    root: &Path,
+    changed_paths: &[String],
+) -> Result<Vec<String>, NaomeError> {
+    if changed_paths.is_empty() {
+        return Err(NaomeError::new("No changed paths are available to commit."));
+    }
+    let verification = read_head_verification(root)?;
+    let checks = verification_checks(&verification);
+    let check_ids = user_diff_check_ids(&verification, changed_paths, &checks)?;
+
+    let initial_paths = sorted_path_set(changed_paths);
+    let mut previous_snapshot = changed_path_snapshot(root, changed_paths)?;
+    for _ in 0..3 {
+        validate_changed_text_whitespace(root, changed_paths)?;
+
+        for check_id in &check_ids {
+            let Some(check) = checks.get(check_id.as_str()) else {
+                return Err(NaomeError::new(format!(
+                    "Quality check {check_id} is referenced but not defined."
+                )));
+            };
+            run_quality_check(root, check_id, check)?;
+        }
+
+        let current_paths = git::changed_paths(root)?;
+        let current_set = sorted_path_set(&current_paths);
+        if current_set != initial_paths {
+            return Err(NaomeError::new(format!(
+                "Quality checks changed the diff path set from [{}] to [{}].",
+                initial_paths.iter().cloned().collect::<Vec<_>>().join(", "),
+                current_set.iter().cloned().collect::<Vec<_>>().join(", ")
+            )));
+        }
+
+        validate_changed_text_whitespace(root, changed_paths)?;
+        if let Some(check) = checks.get("diff-check") {
+            run_quality_check(root, "diff-check", check)?;
+        }
+        let current_paths = git::changed_paths(root)?;
+        let current_set = sorted_path_set(&current_paths);
+        if current_set != initial_paths {
+            return Err(NaomeError::new(format!(
+                "Quality checks changed the diff path set from [{}] to [{}].",
+                initial_paths.iter().cloned().collect::<Vec<_>>().join(", "),
+                current_set.iter().cloned().collect::<Vec<_>>().join(", ")
+            )));
+        }
+
+        let next_snapshot = changed_path_snapshot(root, changed_paths)?;
+        if next_snapshot == previous_snapshot {
+            return Ok(check_ids);
+        }
+        previous_snapshot = next_snapshot;
+    }
+
+    Err(NaomeError::new(
+        "Quality checks did not stabilize the user-owned diff after three runs.",
+    ))
+}

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

@@ -0,0 +1,126 @@
+use std::collections::HashMap;
+
+use serde_json::Value;
+
+use crate::models::NaomeError;
+use crate::paths;
+
+#[derive(Debug, Clone)]
+pub(super) struct QualityCheck {
+    pub(super) command: String,
+    pub(super) cwd: String,
+}
+
+pub(super) fn verification_checks(verification: &Value) -> HashMap<&str, QualityCheck> {
+    let mut checks = HashMap::new();
+    let Some(items) = verification.get("checks").and_then(Value::as_array) else {
+        return checks;
+    };
+
+    for item in items {
+        let Some(id) = item.get("id").and_then(Value::as_str) else {
+            continue;
+        };
+        let Some(command) = item.get("command").and_then(Value::as_str) else {
+            continue;
+        };
+        let cwd = item
+            .get("cwd")
+            .and_then(Value::as_str)
+            .unwrap_or(".")
+            .to_string();
+        checks.insert(
+            id,
+            QualityCheck {
+                command: command.to_string(),
+                cwd,
+            },
+        );
+    }
+
+    checks
+}
+
+pub(super) fn user_diff_check_ids(
+    verification: &Value,
+    changed_paths: &[String],
+    checks: &HashMap<&str, QualityCheck>,
+) -> Result<Vec<String>, NaomeError> {
+    let mut ids = Vec::new();
+    if checks.contains_key("diff-check") {
+        push_unique_string(&mut ids, "diff-check");
+    }
+    if checks.contains_key("naome-harness-health") {
+        push_unique_string(&mut ids, "naome-harness-health");
+    }
+
+    let Some(change_types) = verification.get("changeTypes").and_then(Value::as_array) else {
+        return Err(no_quality_coverage());
+    };
+    if change_types.is_empty() {
+        return Err(no_quality_coverage());
+    }
+
+    let mut uncovered_paths = Vec::new();
+    for change_type in change_types {
+        let patterns = string_array(change_type.get("paths"));
+        if patterns.is_empty()
+            || !changed_paths
+                .iter()
+                .any(|path| paths::matches_any(path, &patterns))
+        {
+            continue;
+        }
+
+        for check_id in string_array(change_type.get("requiredChecks")) {
+            push_unique_string(&mut ids, &check_id);
+        }
+    }
+
+    for path in changed_paths {
+        let covered = change_types.iter().any(|change_type| {
+            let patterns = string_array(change_type.get("paths"));
+            !patterns.is_empty() && paths::matches_any(path, &patterns)
+        });
+        if !covered {
+            uncovered_paths.push(path.clone());
+        }
+    }
+
+    if !uncovered_paths.is_empty() {
+        return Err(NaomeError::new(format!(
+            "No quality coverage is configured for changed path(s): {}.",
+            uncovered_paths.join(", ")
+        )));
+    }
+    if ids.is_empty() {
+        return Err(NaomeError::new(
+            "No quality checks are configured for these changed paths.",
+        ));
+    }
+
+    Ok(ids)
+}
+
+fn no_quality_coverage() -> NaomeError {
+    NaomeError::new("No quality coverage is configured for user-owned changed paths.")
+}
+
+fn string_array(value: Option<&Value>) -> Vec<String> {
+    value
+        .and_then(Value::as_array)
+        .map(|items| {
+            items
+                .iter()
+                .filter_map(Value::as_str)
+                .map(ToString::to_string)
+                .collect()
+        })
+        .unwrap_or_default()
+}
+
+fn push_unique_string(values: &mut Vec<String>, value: &str) {
+    if !values.iter().any(|item| item == value) {
+        values.push(value.to_string());
+    }
+}

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

@@ -0,0 +1,69 @@
+use std::collections::BTreeSet;
+use std::fs;
+use std::path::Path;
+use std::process::Command;
+
+use serde_json::Value;
+
+use crate::models::NaomeError;
+
+pub(super) fn validate_changed_text_whitespace(
+    root: &Path,
+    changed_paths: &[String],
+) -> Result<(), NaomeError> {
+    for relative_path in changed_paths {
+        let path = root.join(relative_path);
+        if !path.is_file() {
+            continue;
+        }
+        let Ok(content) = fs::read_to_string(&path) else {
+            continue;
+        };
+        for (index, line) in content.lines().enumerate() {
+            if line.ends_with(' ') || line.ends_with('\t') {
+                return Err(NaomeError::new(format!(
+                    "{relative_path}:{} has trailing whitespace.",
+                    index + 1
+                )));
+            }
+        }
+    }
+    Ok(())
+}
+
+pub(super) fn read_head_verification(root: &Path) -> Result<Value, NaomeError> {
+    let output = Command::new("git")
+        .args(["show", "HEAD:.naome/verification.json"])
+        .current_dir(root)
+        .output()?;
+
+    if !output.status.success() {
+        return Err(NaomeError::new(
+            "No committed NAOME verification profile is available for user-diff quality gating.",
+        ));
+    }
+
+    Ok(serde_json::from_slice(&output.stdout)?)
+}
+
+pub(super) fn sorted_path_set(paths: &[String]) -> BTreeSet<String> {
+    paths.iter().cloned().collect()
+}
+
+pub(super) fn changed_path_snapshot(
+    root: &Path,
+    changed_paths: &[String],
+) -> Result<Vec<(String, Option<Vec<u8>>)>, NaomeError> {
+    let mut snapshot = Vec::new();
+    for relative_path in changed_paths {
+        let path = root.join(relative_path);
+        let content = if path.is_file() {
+            Some(fs::read(&path)?)
+        } else {
+            None
+        };
+        snapshot.push((relative_path.clone(), content));
+    }
+    snapshot.sort_by(|left, right| left.0.cmp(&right.0));
+    Ok(snapshot)
+}

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

@@ -0,0 +1,75 @@
+use std::path::Path;
+use std::process::Command;
+
+use crate::models::NaomeError;
+use crate::route::{
+    git_ops::{command_output, git_head},
+    RouteWorktree,
+};
+
+use super::worktree_files::copy_local_harness_files;
+use super::worktree_plan::{available_worktree_candidates, worktree_plan};
+
+pub(super) fn create_isolated_task_worktree(
+    root: &Path,
+    prompt: &str,
+) -> Result<RouteWorktree, NaomeError> {
+    let name_head = task_worktree_name_head(root)?;
+    create_isolated_task_worktree_with_name_head(root, prompt, &name_head)
+}
+
+pub(super) fn create_isolated_task_worktree_with_name_head(
+    root: &Path,
+    prompt: &str,
+    name_head: &str,
+) -> Result<RouteWorktree, NaomeError> {
+    let base_head = git_head(root)?.ok_or_else(|| {
+        NaomeError::new("Cannot create task worktree because the repository has no HEAD.")
+    })?;
+    let plan = worktree_plan(root, prompt, name_head)?;
+    for candidate in available_worktree_candidates(root, &plan)? {
+        let path_text = candidate.path.to_string_lossy().to_string();
+        let output = Command::new("git")
+            .args([
+                "worktree",
+                "add",
+                "-b",
+                &candidate.branch,
+                &path_text,
+                "HEAD",
+            ])
+            .current_dir(root)
+            .output()?;
+        if !output.status.success() {
+            return Err(NaomeError::new(command_output(&output)));
+        }
+
+        copy_local_harness_files(root, &candidate.path)?;
+
+        return Ok(RouteWorktree {
+            path: path_text,
+            branch: candidate.branch,
+            base_head,
+            source_root: root.to_string_lossy().to_string(),
+        });
+    }
+
+    Err(NaomeError::new(
+        "Cannot create a unique NAOME task worktree after 99 attempts.",
+    ))
+}
+
+pub(super) fn preflight_isolated_task_worktree(
+    root: &Path,
+    prompt: &str,
+    name_head: &str,
+) -> Result<(), NaomeError> {
+    let plan = worktree_plan(root, prompt, name_head)?;
+    available_worktree_candidates(root, &plan).map(|_| ())
+}
+
+pub(super) fn task_worktree_name_head(root: &Path) -> Result<String, NaomeError> {
+    git_head(root)?.ok_or_else(|| {
+        NaomeError::new("Cannot create task worktree because the repository has no HEAD.")
+    })
+}

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

@@ -0,0 +1,32 @@
+use std::fs;
+use std::path::Path;
+
+use crate::install_plan::{LOCAL_NATIVE_BINARY_PATHS, LOCAL_ONLY_MACHINE_OWNED_PATHS};
+use crate::models::NaomeError;
+
+pub(super) fn copy_local_harness_files(
+    source_root: &Path,
+    worktree_root: &Path,
+) -> Result<(), NaomeError> {
+    let mut paths = Vec::new();
+    paths.extend_from_slice(LOCAL_ONLY_MACHINE_OWNED_PATHS);
+    paths.extend_from_slice(LOCAL_NATIVE_BINARY_PATHS);
+
+    for relative_path in paths {
+        if relative_path == ".naome/archive" || relative_path == ".naome/task-journal.jsonl" {
+            continue;
+        }
+
+        let source = source_root.join(relative_path);
+        if !source.is_file() {
+            continue;
+        }
+        let destination = worktree_root.join(relative_path);
+        if let Some(parent) = destination.parent() {
+            fs::create_dir_all(parent)?;
+        }
+        fs::copy(&source, &destination)?;
+    }
+
+    Ok(())
+}

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

@@ -0,0 +1,131 @@
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+use crate::models::NaomeError;
+use crate::route::{
+    git_ops::{command_output, git_output},
+    MAX_NAOME_TASK_WORKTREES,
+};
+
+pub(super) struct WorktreePlan {
+    pub(super) base: PathBuf,
+    pub(super) slug: String,
+    pub(super) short_head: String,
+}
+
+pub(super) struct WorktreeCandidate {
+    pub(super) path: PathBuf,
+    pub(super) branch: String,
+}
+
+pub(super) fn worktree_plan(
+    root: &Path,
+    prompt: &str,
+    name_head: &str,
+) -> Result<WorktreePlan, NaomeError> {
+    let common_git_dir = git_common_dir(root)?;
+    let base = common_git_dir.join("naome").join("worktrees");
+    fs::create_dir_all(&base)?;
+    let worktree_count = existing_naome_task_worktree_count(&base)?;
+    if worktree_count >= MAX_NAOME_TASK_WORKTREES {
+        return Err(NaomeError::new(format!(
+            "Too many NAOME task worktrees are present ({worktree_count}). Finish or remove old task worktrees before creating another isolated task worktree."
+        )));
+    }
+
+    Ok(WorktreePlan {
+        base,
+        slug: prompt_slug(prompt),
+        short_head: name_head.chars().take(12).collect(),
+    })
+}
+
+pub(super) fn available_worktree_candidates(
+    root: &Path,
+    plan: &WorktreePlan,
+) -> Result<Vec<WorktreeCandidate>, NaomeError> {
+    let mut candidates = Vec::new();
+    for attempt in 1..100 {
+        let suffix = if attempt == 1 {
+            String::new()
+        } else {
+            format!("-{attempt}")
+        };
+        let name = format!("{}-{}{}", plan.slug, plan.short_head, suffix);
+        let branch = format!("naome/task/{name}");
+        let path = plan.base.join(&name);
+        if !path.exists() && !git_branch_exists(root, &branch)? {
+            candidates.push(WorktreeCandidate { path, branch });
+            return Ok(candidates);
+        }
+    }
+
+    Err(NaomeError::new(
+        "Cannot create a unique NAOME task worktree after 99 attempts.",
+    ))
+}
+
+fn existing_naome_task_worktree_count(worktree_base: &Path) -> Result<usize, NaomeError> {
+    let mut count = 0;
+    for entry in fs::read_dir(worktree_base)? {
+        let entry = entry?;
+        if entry.file_type()?.is_dir() {
+            count += 1;
+        }
+    }
+    Ok(count)
+}
+
+fn git_common_dir(root: &Path) -> Result<PathBuf, NaomeError> {
+    let output = git_output(root, &["rev-parse", "--git-common-dir"])?;
+    if !output.status.success() {
+        return Err(NaomeError::new(command_output(&output)));
+    }
+
+    let value = String::from_utf8_lossy(&output.stdout).trim().to_string();
+    let path = PathBuf::from(value);
+    if path.is_absolute() {
+        Ok(path)
+    } else {
+        Ok(root.join(path))
+    }
+}
+
+fn git_branch_exists(root: &Path, branch: &str) -> Result<bool, NaomeError> {
+    let ref_name = format!("refs/heads/{branch}");
+    let output = Command::new("git")
+        .args(["show-ref", "--verify", "--quiet", &ref_name])
+        .current_dir(root)
+        .output()?;
+    match output.status.code() {
+        Some(0) => Ok(true),
+        Some(1) => Ok(false),
+        _ => Err(NaomeError::new(command_output(&output))),
+    }
+}
+
+fn prompt_slug(prompt: &str) -> String {
+    let mut slug = String::new();
+    let mut previous_dash = false;
+    for character in prompt.chars().flat_map(char::to_lowercase) {
+        if character.is_ascii_alphanumeric() {
+            slug.push(character);
+            previous_dash = false;
+        } else if !previous_dash && !slug.is_empty() {
+            slug.push('-');
+            previous_dash = true;
+        }
+
+        if slug.len() >= 40 {
+            break;
+        }
+    }
+
+    let slug = slug.trim_matches('-').to_string();
+    if slug.is_empty() {
+        "task".to_string()
+    } else {
+        slug
+    }
+}