@lamentis/naome 1.4.3 → 1.4.4

package/Cargo.lock

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

package/crates/naome-cli/Cargo.toml

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

package/crates/naome-cli/src/task_commands/agent_snapshot.rs

@@ -1,3 +1,4 @@
+use std::collections::{BTreeMap, BTreeSet};
 use std::path::Path;
 
 use naome_core::{
@@ -77,23 +78,80 @@ pub(super) fn agent_snapshot(
 }
 
 fn merge_commands(left: Value, right: Vec<Value>) -> Vec<Value> {
-    let mut commands = left
+    let commands = left
         .as_array()
         .cloned()
         .unwrap_or_default()
         .into_iter()
         .chain(right)
         .collect::<Vec<_>>();
-    commands.sort_by(|a, b| {
-        a.get("checkId")
+    let mut merged = BTreeMap::<String, Value>::new();
+    for command in commands {
+        let Some(check_id) = command
+            .get("checkId")
             .and_then(Value::as_str)
-            .unwrap_or("")
-            .cmp(b.get("checkId").and_then(Value::as_str).unwrap_or(""))
-    });
-    commands.dedup_by(|a, b| {
-        a.get("checkId").and_then(Value::as_str) == b.get("checkId").and_then(Value::as_str)
-    });
-    commands
+            .map(ToString::to_string)
+        else {
+            continue;
+        };
+        if let Some(existing) = merged.get_mut(&check_id) {
+            merge_command(existing, &command);
+        } else {
+            merged.insert(check_id, command);
+        }
+    }
+    merged.into_values().collect()
+}
+
+fn merge_command(existing: &mut Value, incoming: &Value) {
+    merge_csv_field(existing, incoming, "reason");
+    existing["selectionReason"] = existing["reason"].clone();
+    merge_string_array_field(existing, incoming, "impactedPaths");
+    let safe = existing
+        .get("safeToExecute")
+        .and_then(Value::as_bool)
+        .unwrap_or(false)
+        && incoming
+            .get("safeToExecute")
+            .and_then(Value::as_bool)
+            .unwrap_or(false);
+    existing["safeToExecute"] = json!(safe);
+}
+
+fn merge_csv_field(existing: &mut Value, incoming: &Value, field: &str) {
+    let mut values = BTreeSet::new();
+    collect_csv(existing.get(field), &mut values);
+    collect_csv(incoming.get(field), &mut values);
+    existing[field] = json!(values.into_iter().collect::<Vec<_>>().join(","));
+}
+
+fn collect_csv(value: Option<&Value>, values: &mut BTreeSet<String>) {
+    if let Some(raw) = value.and_then(Value::as_str) {
+        values.extend(
+            raw.split(',')
+                .map(str::trim)
+                .filter(|part| !part.is_empty())
+                .map(ToString::to_string),
+        );
+    }
+}
+
+fn merge_string_array_field(existing: &mut Value, incoming: &Value, field: &str) {
+    let mut values = BTreeSet::new();
+    collect_string_array(existing.get(field), &mut values);
+    collect_string_array(incoming.get(field), &mut values);
+    existing[field] = json!(values.into_iter().collect::<Vec<_>>());
+}
+
+fn collect_string_array(value: Option<&Value>, values: &mut BTreeSet<String>) {
+    values.extend(
+        value
+            .and_then(Value::as_array)
+            .into_iter()
+            .flatten()
+            .filter_map(Value::as_str)
+            .map(ToString::to_string),
+    );
 }
 
 fn snapshot_state(status: &naome_core::TaskStatusReportV1) -> &'static str {

package/crates/naome-cli/tests/task_cli_fast_flow.rs

@@ -7,7 +7,7 @@ mod task_cli_support;
 
 use task_cli_support::{
     active_task, fixture_root, git, init_git, run_json, task_state, task_state_with_active_task,
-    write_fixture_file, write_json,
+    write_fixture_file, write_json, write_verification_checks,
 };
 
 #[test]
@@ -24,6 +24,48 @@ fn agent_snapshot_reports_missing_proof_and_safe_commands() {
     assert_eq!(snapshot["checks"]["safeToRun"][0]["checkId"], "diff-check");
 }
 
+#[test]
+fn agent_snapshot_merges_duplicate_check_reasons_from_proof_and_impact_plans() {
+    let root = fixture_root(task_state_with_active_task(active_task(json!({
+        "allowedPaths": ["src/lib.rs"],
+        "requiredCheckIds": ["repository-quality-check"],
+        "proofResults": []
+    }))));
+    write_verification_checks(
+        &root,
+        json!([{
+            "id": "repository-quality-check",
+            "command": "node .naome/bin/naome.js quality check --changed",
+            "cwd": ".",
+            "purpose": "Validate changed-file quality.",
+            "cost": "fast",
+            "source": "NAOME",
+            "evidence": [".naome/repository-quality.json"],
+            "lastVerified": null
+        }]),
+    );
+    init_git(&root);
+    write_fixture_file(&root, "src/lib.rs", "pub fn changed() {}\n");
+
+    let snapshot = run_json(&root, ["task", "agent-snapshot", "--json"]);
+    let commands = snapshot["checks"]["recommended"].as_array().unwrap();
+    let quality_commands = commands
+        .iter()
+        .filter(|command| command["checkId"] == "repository-quality-check")
+        .collect::<Vec<_>>();
+
+    assert_eq!(quality_commands.len(), 1);
+    assert_eq!(
+        quality_commands[0]["reason"],
+        "changed_source,missing-proof"
+    );
+    assert_eq!(
+        quality_commands[0]["selectionReason"],
+        "changed_source,missing-proof"
+    );
+    assert_eq!(quality_commands[0]["impactedPaths"], json!(["src/lib.rs"]));
+}
+
 #[test]
 fn preflight_reports_path_policy_and_check_plan() {
     let root = fixture_root(task_state_with_active_task(active_task(json!({

package/crates/naome-core/Cargo.toml

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

package/package.json

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