@lamentis/naome 1.0.1 → 1.1.0

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

@@ -1,5 +1,5 @@
-use std::fs;
 use std::ffi::OsString;
+use std::fs;
 use std::path::Path;
 use std::process::Command;
 
@@ -8,6 +8,7 @@ use serde_json::Value;
 use crate::git;
 use crate::models::{CheckDecision, Decision, NaomeError, TaskDecision};
 use crate::paths;
+use crate::task_state::harness_refresh_diff;
 
 #[derive(Debug, Clone, Copy)]
 pub struct EvaluationOptions {
@@ -111,18 +112,38 @@ pub fn evaluate_decision(root: &Path, options: EvaluationOptions) -> Result<Deci
                 vec!["create_task"],
                 "Task admission is clear; create the next task before feature work.",
             )
-        } else {
+        } else if has_completed_task_owned_paths(task.as_ref(), &changed_paths) {
             Decision::new(
                 "completed_task_unbaselined",
                 true,
-                "A completed NAOME task still has an unbaselined diff.",
+                "A completed NAOME task is verified and waiting for the next routing decision.",
                 vec![
                     "commit_task_baseline",
                     "review_task_diff",
                     "request_task_changes",
                     "cancel_task_changes",
                 ],
-                "Choose how to resolve the completed task diff before accepting new feature work.",
+                "Run NAOME intent for the next natural-language request; deterministic policy can baseline a valid completed task automatically.",
+            )
+        } else if harness_refresh_diff(root)?.is_some_and(|diff| diff.unrelated_paths.is_empty()) {
+            Decision::new(
+                "harness_repair_unbaselined",
+                true,
+                "Machine-owned NAOME harness refresh files changed outside an active task.",
+                vec![
+                    "commit_upgrade_baseline",
+                    "review_diff_first",
+                    "cancel_upgrade_baseline",
+                ],
+                "Run NAOME intent for the next natural-language request; deterministic policy can baseline a pure harness refresh automatically.",
+            )
+        } else {
+            Decision::new(
+                "dirty_unowned_diff",
+                true,
+                "The completed NAOME task has been baselined, but unrelated user changes remain.",
+                vec!["review_unowned_diff"],
+                "Review the unrelated diff, or route a new task so NAOME can isolate task work without touching it.",
             )
         };
         decision.changed_paths = changed_paths;
@@ -131,6 +152,8 @@ pub fn evaluate_decision(root: &Path, options: EvaluationOptions) -> Result<Deci
         decision.required_context = vec![
             "docs/naome/execution.md".to_string(),
             ".naome/task-state.json".to_string(),
+            "docs/naome/agent-workflow.md".to_string(),
+            "docs/naome/testing.md".to_string(),
         ];
         return Ok(decision);
     }
@@ -175,6 +198,7 @@ pub fn evaluate_decision(root: &Path, options: EvaluationOptions) -> Result<Deci
         decision.required_context = vec![
             "docs/naome/execution.md".to_string(),
             ".naome/task-state.json".to_string(),
+            "docs/naome/testing.md".to_string(),
         ];
         return Ok(decision);
     }
@@ -226,6 +250,12 @@ pub fn evaluate_decision(root: &Path, options: EvaluationOptions) -> Result<Deci
     decision.harness_health = harness_health;
     decision.task_admission = task_admission;
     decision.task = task;
+    decision.required_context = vec![
+        "docs/naome/agent-workflow.md".to_string(),
+        "docs/naome/testing.md".to_string(),
+        ".naome/verification.json".to_string(),
+        "docs/naome/architecture.md".to_string(),
+    ];
     Ok(decision)
 }
 
@@ -238,15 +268,20 @@ pub fn format_decision(decision: &Decision, mode: &str) -> String {
     let mut lines = vec![
         format!("{title}: {}", decision.state),
         format!("Blocked: {}", decision.blocked),
-        format!("Summary: {}", decision.summary),
+        format!("Summary: {}", decision.user_message),
         format!("Next action: {}", decision.next_action),
     ];
 
-    if !decision.allowed_actions.is_empty() {
+    if should_show_allowed_actions(decision) {
         lines.push(format!(
             "Allowed actions: {}",
             decision.allowed_actions.join(", ")
         ));
+    } else if is_intent_routed_baseline_state(&decision.state) {
+        lines.push(
+            "Intent routing: run `naome intent --prompt-file <path>` before presenting human choices."
+                .to_string(),
+        );
     }
 
     if !decision.changed_paths.is_empty() {
@@ -267,6 +302,19 @@ pub fn format_decision(decision: &Decision, mode: &str) -> String {
     lines.join("\n")
 }
 
+fn should_show_allowed_actions(decision: &Decision) -> bool {
+    !decision.allowed_actions.is_empty() && !is_intent_routed_baseline_state(&decision.state)
+}
+
+fn is_intent_routed_baseline_state(state: &str) -> bool {
+    matches!(
+        state,
+        "completed_task_unbaselined"
+            | "install_or_upgrade_unbaselined"
+            | "harness_repair_unbaselined"
+    )
+}
+
 fn classify_idle_diff(root: &Path, changed_paths: Vec<String>) -> Result<Decision, NaomeError> {
     let manifest = read_json(root, ".naome/manifest.json").unwrap_or(Value::Null);
     let machine_owned = string_array_at(&manifest, "machineOwned");
@@ -284,7 +332,21 @@ fn classify_idle_diff(root: &Path, changed_paths: Vec<String>) -> Result<Decisio
             .iter()
             .all(|path| paths::matches_any(path, &known_harness_paths));
 
-    let mut decision = if all_machine_owned {
+    let mut decision = if harness_refresh_diff(root)?
+        .is_some_and(|diff| diff.unrelated_paths.is_empty())
+    {
+        Decision::new(
+            "harness_repair_unbaselined",
+            true,
+            "Machine-owned NAOME harness refresh files changed outside an active task.",
+            vec![
+                "commit_upgrade_baseline",
+                "review_diff_first",
+                "cancel_upgrade_baseline",
+            ],
+            "Run NAOME intent for the next natural-language request; deterministic policy can baseline a pure harness refresh automatically.",
+        )
+    } else if all_machine_owned {
         Decision::new(
             "harness_repair_unbaselined",
             true,
@@ -313,8 +375,8 @@ fn classify_idle_diff(root: &Path, changed_paths: Vec<String>) -> Result<Decisio
             "dirty_unowned_diff",
             true,
             "The repository has changes not owned by an active NAOME task.",
-            vec!["review_unowned_diff", "clear_or_commit_unowned_diff"],
-            "Review, commit, or clear the unowned diff before accepting new feature work.",
+            vec!["review_unowned_diff"],
+            "Review the unowned diff, or route a new task so NAOME can isolate task work without touching it.",
         )
     };
 
@@ -345,6 +407,16 @@ fn is_control_state_path(path: &str) -> bool {
     path == ".naome/task-state.json"
 }
 
+fn has_completed_task_owned_paths(task: Option<&TaskDecision>, changed_paths: &[String]) -> bool {
+    let Some(task) = task else {
+        return false;
+    };
+
+    changed_paths
+        .iter()
+        .any(|path| is_control_state_path(path) || paths::matches_any(path, &task.allowed_paths))
+}
+
 fn run_node_check(root: &Path, script: &str, args: &[&str]) -> Result<CheckDecision, NaomeError> {
     let mut command_args = vec![script.to_string()];
     command_args.extend(args.iter().map(ToString::to_string));
@@ -405,7 +477,7 @@ fn string_array_at(value: &Value, key: &str) -> Vec<String> {
 }
 
 fn extract_known_actions(output: &str) -> Vec<&'static str> {
-    const KNOWN: [&str; 12] = [
+    const KNOWN: [&str; 11] = [
         "commit_task_baseline",
         "review_task_diff",
         "request_task_changes",
@@ -416,7 +488,6 @@ fn extract_known_actions(output: &str) -> Vec<&'static str> {
         "run_first_run_protocol",
         "run_upgrade_protocol",
         "review_unowned_diff",
-        "clear_or_commit_unowned_diff",
         "create_task",
     ];
 

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

@@ -38,7 +38,18 @@ pub fn changed_paths(root: &Path) -> Result<Vec<String>, NaomeError> {
         }
 
         if status.contains('R') || status.contains('C') {
-            let _ = entries.next();
+            let previous_path = entries.next();
+            if status.contains('R') {
+                if let Some(previous_path_bytes) = previous_path {
+                    let previous_path =
+                        String::from_utf8_lossy(previous_path_bytes).replace('\\', "/");
+                    if !previous_path.is_empty()
+                        && !paths::matches_any(&previous_path, &ignored_patterns)
+                    {
+                        paths.push(previous_path);
+                    }
+                }
+            }
         }
     }
 

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

@@ -496,7 +496,9 @@ fn sha256_bytes(content: &[u8]) -> String {
 }
 
 fn normalize_machine_owned_content(relative_path: &str, content: &[u8]) -> Vec<u8> {
-    if relative_path == HEALTH_CHECKER_RELATIVE_PATH || relative_path == TASK_STATE_CHECKER_RELATIVE_PATH {
+    if relative_path == HEALTH_CHECKER_RELATIVE_PATH
+        || relative_path == TASK_STATE_CHECKER_RELATIVE_PATH
+    {
         return replace_expected_integrity_block(content);
     }
 

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

@@ -41,10 +41,11 @@ pub const LOCAL_ONLY_MACHINE_OWNED_PATHS: &[&str] = &[
     "docs/naome/upgrade.md",
 ];
 
-const LOCAL_NATIVE_BINARY_PATHS: &[&str] = &[
+pub const LOCAL_NATIVE_BINARY_PATHS: &[&str] = &[
     ".naome/bin/naome-rust",
     ".naome/bin/naome-rust.exe",
     ".naome/archive",
+    ".naome/task-journal.jsonl",
 ];
 
 #[derive(Debug, Clone, Serialize, PartialEq, Eq)]
@@ -56,16 +57,19 @@ pub struct InstallPlan {
     pub project_owned: Vec<&'static str>,
     pub local_only_machine_owned: Vec<&'static str>,
     pub gitignore_entries: Vec<&'static str>,
+    pub git_exclude_entries: Vec<&'static str>,
     pub git_untrack_paths: Vec<&'static str>,
 }
 
 pub fn install_plan(harness_version: impl Into<String>) -> InstallPlan {
-    let mut gitignore_entries = vec![
+    let gitignore_entries = vec![".naome/task-journal.jsonl"];
+    let mut git_exclude_entries = vec![
         "# NAOME local machine-owned harness files.",
         ".naome/archive/",
         ".naome/bin/naome-rust*",
+        ".naome/task-journal.jsonl",
     ];
-    gitignore_entries.extend_from_slice(LOCAL_ONLY_MACHINE_OWNED_PATHS);
+    git_exclude_entries.extend_from_slice(LOCAL_ONLY_MACHINE_OWNED_PATHS);
 
     let mut git_untrack_paths = LOCAL_ONLY_MACHINE_OWNED_PATHS.to_vec();
     git_untrack_paths.extend_from_slice(LOCAL_NATIVE_BINARY_PATHS);
@@ -77,6 +81,7 @@ pub fn install_plan(harness_version: impl Into<String>) -> InstallPlan {
         project_owned: PROJECT_OWNED_PATHS.to_vec(),
         local_only_machine_owned: LOCAL_ONLY_MACHINE_OWNED_PATHS.to_vec(),
         gitignore_entries,
+        git_exclude_entries,
         git_untrack_paths,
     }
 }