@lamentis/naome 1.3.0 → 1.3.2

package/Cargo.lock

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

package/README.md

@@ -50,6 +50,8 @@ naome route --prompt-file /path/to/prompt.txt --execute --json
   perfect on day one.
 - Records verification proof before a task can be treated as complete.
 - Keeps sync fast by making baseline and deep quality scans explicit.
+- Can install optional Codex hooks for earlier agent feedback without making
+  hooks a human workflow requirement.
 
 ## Safety Model
 
@@ -77,12 +79,15 @@ naome quality init --baseline
 naome quality report
 naome quality report --deep
 naome quality check --changed
+naome semantic check --changed
+naome task render-state --write --json
 naome commit -m "type(scope): summary"
 ```
 
 `naome sync` installs or repairs the local harness files. It does not run a
-hidden full-repository quality scan. If quality policy is newly seeded, run
-`naome quality init --baseline` deliberately; use `--deep` or
+hidden full-repository quality scan. It also migrates any active legacy
+task-state into the task ledger automatically. If quality policy is newly
+seeded, run `naome quality init --baseline` deliberately; use `--deep` or
 `--deep-baseline` only when you want expensive repository-wide checks.
 
 ## Repository Docs
@@ -94,6 +99,8 @@ After sync, NAOME writes the agent-facing workflow into `docs/naome/`:
 - `docs/naome/testing.md` maps change types to required checks.
 - `docs/naome/repository-quality.md` explains quality, structure, and cleanup
   policy.
+- `docs/naome/codex-hooks.md` explains the optional Codex hook acceleration
+  layer.
 
 Agents should follow the repository's NAOME docs instead of guessing workflow
 rules from generic project files.
@@ -109,6 +116,7 @@ The main local policy files are:
 - `.naome/repository-structure.json` for path role, module, and directory
   structure policy.
 - `.naome/task-state.json` for active task state and proof.
+- `.codex/hooks.json` only when optional Codex hooks were explicitly enabled.
 
 Product defaults stay generic. Repository-specific policy belongs in the local
 `.naome/` config files.
@@ -123,6 +131,7 @@ npm run test:decision-engine
 npm run test:naome-installer
 npm run pack:dry-run
 node .naome/bin/naome.js quality check --changed --json
+node .naome/bin/naome.js semantic check --changed --json
 git diff --check
 ```
 

package/bin/naome.js

@@ -12,7 +12,7 @@ const packageVersion = packageMetadata.version;
 const nativeBinaryName = process.platform === "win32" ? "naome.exe" : "naome";
 const args = process.argv.slice(2);
 const [command] = args;
-const helpCommands = "status [--json]|next [--json]|intent --prompt-file <path> [--json]|intent --prompt <text> [--json]|route --prompt-file <path> [--execute] [--json]|route --prompt <text> [--execute] [--json]|explain --prompt-file <path> [--json]|explain --prompt <text> [--json]|doctor [--json]|install|sync [--check-update]|update [--json] [--execute]|quality init [--baseline|--deep-baseline] [--json]|quality check --changed [--include-scanned-paths] [--json]|quality report [--deep] [--include-scanned-paths] [--json]|quality cache status [--json]|quality cache clear|semantic report [--deep] [--json]|semantic check --changed [--json]|semantic route --finding <id> [--json]|semantic loop [--json]|structure report [--json]|structure explain --path <path> [--json]|cleanup plan [--json]|cleanup route --path <path> [--json]|refresh-integrity [--json]|workflow search-profile|check-search|phases|processes|mutations [--json]|commit -m \"type(scope): message\"".split("|");
+const helpCommands = "status [--json]|next [--json]|intent --prompt-file <path> [--json]|intent --prompt <text> [--json]|route --prompt-file <path> [--execute] [--json]|route --prompt <text> [--execute] [--json]|explain --prompt-file <path> [--json]|explain --prompt <text> [--json]|context select --changed [--json]|context select --prompt-file <path> [--json]|context select --prompt <text> [--json]|doctor [--json]|install|sync [--check-update]|update [--json] [--execute]|task render-state [--write] [--json]|task migrate-ledger [--write] [--json]|quality init [--baseline|--deep-baseline] [--json]|quality reconcile [--write] [--json]|quality check --changed [--include-scanned-paths] [--json]|quality check --path <path> [--path <path>...] [--include-scanned-paths] [--json]|quality report [--deep] [--include-scanned-paths] [--json]|quality cache status [--json]|quality cache clear|semantic report [--deep] [--json]|semantic check --changed [--json]|semantic check --path <path> [--path <path>...] [--json]|semantic route --finding <id> [--json]|semantic loop [--json]|repo model [--write] [--json]|repo check [--json]|repo explain --path <path> [--json]|structure report [--json]|structure explain --path <path> [--json]|cleanup plan [--json]|cleanup route --path <path> [--json]|refresh-integrity [--json]|workflow agent-plan|context-delta|proof-plan|capabilities|edit-watchdog|decision-gate|digest [--json]|workflow search-profile|check-search|phases|processes|mutations [--json]|commit -m \"type(scope): message\"".split("|");
 
 if (isHelpRequest(args)) {
   printHelp();
@@ -31,6 +31,7 @@ if (command === "install" || command === "sync") {
   const qualityConfigExisted = existsSync(repositoryQualityConfigPath(process.cwd()));
   const result = runNativePackageCommand(args.filter((arg) => arg !== "--check-update"));
   if (result.status === 0) {
+    ensureTaskLedgerMigrated(result.nativeBinary);
     ensureRepositoryQualityInitialized(result.nativeBinary, qualityConfigExisted);
   }
   process.exit(result.status === null ? 1 : result.status);
@@ -281,27 +282,11 @@ function ensureRepositoryQualityInitialized(nativeBinary, qualityConfigExisted)
     }
   }
 
-  const result = spawnSync(nativeBinary, ["quality", "init", "--json"], {
-    cwd: root,
-    encoding: "utf8",
-    env: {
-      ...process.env,
-      NAOME_NODE_BIN: process.execPath
-    }
-  });
-
-  if (result.status !== 0) {
-    console.error("NAOME: repository quality initialization failed.");
-    if (result.stdout.trim()) {
-      console.error(result.stdout.trim());
-    }
-    if (result.stderr.trim()) {
-      console.error(result.stderr.trim());
-    }
-    process.exit(result.status === null ? 1 : result.status);
-  }
-
-  const output = result.stdout.trim();
+  const output = runNativeJsonCommand(
+    nativeBinary,
+    ["quality", "init", "--json"],
+    "repository quality initialization failed"
+  );
   if (output) {
     try {
       const init = JSON.parse(output);
@@ -317,6 +302,59 @@ function ensureRepositoryQualityInitialized(nativeBinary, qualityConfigExisted)
   }
 }
 
+function ensureTaskLedgerMigrated(nativeBinary) {
+  const root = process.cwd();
+  if (!existsSync(join(root, ".naome"))) {
+    return;
+  }
+
+  const output = runNativeJsonCommand(
+    nativeBinary,
+    ["task", "migrate-ledger", "--write", "--json"],
+    "task ledger migration failed"
+  );
+  if (!output) {
+    return;
+  }
+
+  try {
+    const migration = JSON.parse(output);
+    if (migration.updated && migration.migration?.source === "task-state") {
+      console.log("task ledger migrated from task-state");
+    }
+  } catch (_error) {
+    console.log(output);
+  }
+}
+
+function runNativeJsonCommand(nativeBinary, commandArgs, failureLabel) {
+  const result = spawnSync(nativeBinary, commandArgs, {
+    cwd: process.cwd(),
+    encoding: "utf8",
+    env: {
+      ...process.env,
+      NAOME_NODE_BIN: process.execPath
+    }
+  });
+
+  if (result.status !== 0) {
+    exitNativeJsonFailure(failureLabel, result);
+  }
+
+  return result.stdout.trim();
+}
+
+function exitNativeJsonFailure(label, result) {
+  console.error(`NAOME: ${label}.`);
+  for (const stream of [result.stdout, result.stderr]) {
+    const text = stream.trim();
+    if (text) {
+      console.error(text);
+    }
+  }
+  process.exit(result.status === null ? 1 : result.status);
+}
+
 function repositoryQualityConfigPath(root) {
   return join(root, ".naome", "repository-quality.json");
 }
@@ -339,8 +377,8 @@ function repositoryQualitySupportFilesExist(root) {
 function resolveNativePackageBinary() {
   const candidates = [
     process.env.NAOME_NATIVE_BIN && resolve(process.cwd(), process.env.NAOME_NATIVE_BIN),
-    join(packageRoot, "native", `${process.platform}-${process.arch}`, nativeBinaryName),
-    join(packageRoot, "target", "release", nativeBinaryName)
+    join(packageRoot, "target", "release", nativeBinaryName),
+    join(packageRoot, "native", `${process.platform}-${process.arch}`, nativeBinaryName)
   ].filter(Boolean);
 
   for (const candidate of candidates) {

package/crates/naome-cli/Cargo.toml

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

package/crates/naome-cli/src/context_commands.rs

@@ -0,0 +1,47 @@
+use std::fs;
+use std::path::Path;
+
+use naome_core::{select_context_for_changed_paths, select_context_for_prompt};
+
+use crate::cli_args::option_value;
+
+pub fn run_context_command(root: &Path, args: &[String]) -> Result<(), Box<dyn std::error::Error>> {
+    let Some(subcommand) = args.get(1).map(String::as_str) else {
+        return Err("naome context requires select.".into());
+    };
+    match subcommand {
+        "select" => run_context_select(root, args)?,
+        _ => return Err(format!("unknown naome context command: {subcommand}").into()),
+    }
+    Ok(())
+}
+
+fn run_context_select(root: &Path, args: &[String]) -> Result<(), Box<dyn std::error::Error>> {
+    let selection = if args.iter().any(|arg| arg == "--changed") {
+        select_context_for_changed_paths(root)?
+    } else if let Some(prompt) = option_value(args, "--prompt") {
+        select_context_for_prompt(root, prompt)?
+    } else if let Some(prompt_file) = option_value(args, "--prompt-file") {
+        select_context_for_prompt(root, fs::read_to_string(prompt_file)?)?
+    } else {
+        return Err(
+            "naome context select requires --changed, --prompt <text>, or --prompt-file <path>."
+                .into(),
+        );
+    };
+
+    if args.iter().any(|arg| arg == "--json") {
+        println!("{}", serde_json::to_string_pretty(&selection)?);
+    } else {
+        println!(
+            "NAOME context capsule: {} ({} file(s), ~{} token(s))",
+            selection.capsule.id,
+            selection.budget_ledger.selected_files,
+            selection.budget_ledger.estimated_tokens
+        );
+        for item in &selection.required_context {
+            println!("- {}", item.path);
+        }
+    }
+    Ok(())
+}

package/crates/naome-cli/src/dispatcher.rs

@@ -1,14 +1,17 @@
 use std::path::Path;
 
 use crate::check_commands::{run_harness_health, run_task_state, run_verification_contract};
+use crate::context_commands::run_context_command;
 use crate::install_bridge::run_install_bridge;
 use crate::prompt_commands::{run_explain, run_intent, run_route};
 use crate::quality_commands::{
     run_cleanup_command, run_quality_command, run_semantic_command, run_structure_command,
 };
+use crate::repository_model_commands::run_repo_command;
 use crate::simple_commands::{
     print_install_plan, run_commit_paths, run_journal_task, seed_verification,
 };
+use crate::task_commands::run_task_command;
 use crate::workflow_commands::{run_doctor, run_refresh_integrity, run_workflow_command};
 
 pub fn dispatch_command(
@@ -20,10 +23,13 @@ pub fn dispatch_command(
         "install" | "sync" => run_install_bridge(command, args)?,
         "install-plan" => print_install_plan(args)?,
         "seed-verification" => seed_verification(root)?,
+        "task" => run_task_command(root, args)?,
         "refresh-integrity" => run_refresh_integrity(root, args)?,
+        "context" => run_context_command(root, args)?,
         "doctor" => run_doctor(root, args)?,
         "quality" => run_quality_command(root, args)?,
         "semantic" => run_semantic_command(root, args)?,
+        "repo" => run_repo_command(root, args)?,
         "structure" => run_structure_command(root, args)?,
         "cleanup" => run_cleanup_command(root, args)?,
         "workflow" => run_workflow_command(root, args)?,

package/crates/naome-cli/src/main.rs

@@ -1,10 +1,15 @@
 mod check_commands;
 mod cli_args;
+mod context_commands;
 mod dispatcher;
 mod install_bridge;
 mod prompt_commands;
 mod quality_commands;
+mod quality_output;
+mod quality_reconcile_command;
+mod repository_model_commands;
 mod simple_commands;
+mod task_commands;
 mod workflow_commands;
 
 use std::path::{Path, PathBuf};
@@ -22,26 +27,44 @@ const HELP: &str = r#"Usage:
   naome route --prompt <text> [--execute] [--json]
   naome explain --prompt-file <path> [--json]
   naome explain --prompt <text> [--json]
+  naome context select --changed [--json]
+  naome context select --prompt-file <path> [--json]
+  naome context select --prompt <text> [--json]
   naome doctor [--json]
   naome install [--package-root <path>] [--installer-js <path>]
   naome sync [--package-root <path>] [--installer-js <path>]
   naome install-plan [--harness-version <version>]
   naome seed-verification
+  naome task render-state [--write] [--json]
+  naome task migrate-ledger [--write] [--json]
   naome refresh-integrity [--root <path>] [--json]
   naome quality init [--baseline|--deep-baseline] [--json]
+  naome quality reconcile [--write] [--json]
   naome quality check --changed [--include-scanned-paths] [--json]
+  naome quality check --path <path> [--path <path>...] [--include-scanned-paths] [--json]
   naome quality report [--deep] [--include-scanned-paths] [--json]
   naome quality cache status [--json]
   naome quality cache clear
   naome semantic report [--deep] [--json]
   naome semantic check --changed [--json]
+  naome semantic check --path <path> [--path <path>...] [--json]
   naome semantic route --finding <id> [--json]
   naome semantic loop [--json]
+  naome repo model [--write] [--json]
+  naome repo check [--json]
+  naome repo explain --path <path> [--json]
   naome structure report [--json]
   naome structure explain --path <path> [--json]
   naome cleanup plan [--json]
   naome cleanup route --path <path> [--json]
   naome workflow search-profile [--json]
+  naome workflow agent-plan [--json]
+  naome workflow context-delta [--read-path <path>...] [--json]
+  naome workflow proof-plan [--json]
+  naome workflow capabilities [--json]
+  naome workflow edit-watchdog --path <path> [--path <path>...] [--json]
+  naome workflow decision-gate [--json]
+  naome workflow digest --command <cmd> --exit-code <code> [--output <text>|--output-file <path>] [--json]
   naome workflow check-search --command <cmd> [--json]
   naome workflow phases [--json]
   naome workflow processes [--json]
@@ -60,10 +83,13 @@ const PUBLIC_COMMANDS: &[&str] = &[
     "journal-task",
     "commit-paths",
     "seed-verification",
+    "task",
     "refresh-integrity",
+    "context",
     "workflow",
     "quality",
     "semantic",
+    "repo",
     "structure",
     "cleanup",
     "install-plan",
@@ -140,7 +166,13 @@ fn is_help_request(args: &[String]) -> bool {
 }
 
 fn find_harness_root(start: &Path) -> Option<PathBuf> {
-    find_root_with_marker(start, &[".naome", "task-state.json"])
+    find_root_with_any_marker(
+        start,
+        &[
+            &[".naome", "task-state.json"],
+            &[".naome", "tasks", "active.json"],
+        ],
+    )
 }
 
 fn find_manifest_root(start: &Path) -> Option<PathBuf> {
@@ -148,13 +180,18 @@ fn find_manifest_root(start: &Path) -> Option<PathBuf> {
 }
 
 fn find_root_with_marker(start: &Path, marker: &[&str]) -> Option<PathBuf> {
+    find_root_with_any_marker(start, &[marker])
+}
+
+fn find_root_with_any_marker(start: &Path, markers: &[&[&str]]) -> Option<PathBuf> {
     let mut current = start.to_path_buf();
     loop {
-        if marker
-            .iter()
-            .fold(current.clone(), |path, part| path.join(part))
-            .is_file()
-        {
+        if markers.iter().any(|marker| {
+            marker
+                .iter()
+                .fold(current.clone(), |path, part| path.join(part))
+                .is_file()
+        }) {
             return Some(current);
         }
 

package/crates/naome-cli/src/quality_commands.rs

@@ -1,17 +1,19 @@
 use std::path::Path;
 
 use naome_core::{
-    check_repository_quality, check_semantic_legacy, clear_quality_cache,
-    explain_repository_structure, init_repository_quality_with_mode, plan_quality_cleanup,
-    quality_cache_status, route_quality_cleanup, semantic_route_for_finding, QualityInitMode,
-    QualityMode,
+    check_repository_quality, check_repository_quality_paths, check_semantic_legacy, check_semantic_legacy_paths,
+    clear_quality_cache, explain_repository_structure, init_repository_quality_with_mode,
+    plan_quality_cleanup, quality_cache_status, route_quality_cleanup, semantic_route_for_finding,
+    QualityInitMode, QualityMode,
 };
 
 use crate::cli_args::option_value;
+use crate::quality_output::{is_structure_check, print_quality_violation, report_json};
+use crate::quality_reconcile_command::run_quality_reconcile;
 
 pub fn run_quality_command(root: &Path, args: &[String]) -> Result<(), Box<dyn std::error::Error>> {
     let Some(subcommand) = args.get(1).map(String::as_str) else {
-        return Err("naome quality requires init, check, report, or cache.".into());
+        return Err("naome quality requires init, reconcile, check, report, or cache.".into());
     };
     let json = args.iter().any(|arg| arg == "--json");
 
@@ -30,6 +32,7 @@ pub fn run_quality_command(root: &Path, args: &[String]) -> Result<(), Box<dyn s
                 }
             }
         }
+        "reconcile" => run_quality_reconcile(root, args, json)?,
         "check" => run_quality_check(root, args, json)?,
         "report" => run_quality_report(root, args, json)?,
         "cache" => run_quality_cache(root, args, json)?,
@@ -93,10 +96,15 @@ fn run_quality_check(
     args: &[String],
     json: bool,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    if !args.iter().any(|arg| arg == "--changed") {
-        return Err("naome quality check requires --changed.".into());
-    }
-    let report = check_repository_quality(root, QualityMode::ChangedFast)?;
+    let paths = option_values(args, "--path");
+    let report = if paths.is_empty() {
+        if !args.iter().any(|arg| arg == "--changed") {
+            return Err("naome quality check requires --changed or --path <path>.".into());
+        }
+        check_repository_quality(root, QualityMode::ChangedFast)?
+    } else {
+        check_repository_quality_paths(root, &paths)?
+    };
     if json {
         println!("{}", report_json(&report, args)?);
     } else if report.ok {
@@ -303,10 +311,15 @@ fn run_semantic_check(
     args: &[String],
     json: bool,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    if !args.iter().any(|arg| arg == "--changed") {
-        return Err("naome semantic check requires --changed.".into());
-    }
-    let report = check_semantic_legacy(root, QualityMode::ChangedFast)?;
+    let paths = option_values(args, "--path");
+    let report = if paths.is_empty() {
+        if !args.iter().any(|arg| arg == "--changed") {
+            return Err("naome semantic check requires --changed or --path <path>.".into());
+        }
+        check_semantic_legacy(root, QualityMode::ChangedFast)?
+    } else {
+        check_semantic_legacy_paths(root, &paths)?
+    };
     if json {
         println!("{}", serde_json::to_string_pretty(&report)?);
     } else if report.ok {
@@ -397,20 +410,6 @@ fn run_semantic_loop(root: &Path, json: bool) -> Result<(), Box<dyn std::error::
     Ok(())
 }
 
-fn is_structure_check(check_id: &str) -> bool {
-    matches!(
-        check_id,
-        "directory-role-mixing"
-            | "misplaced-file-role"
-            | "root-file-sprawl"
-            | "dumping-ground-directory"
-            | "directory-size"
-            | "path-depth"
-            | "case-collision"
-            | "test-source-pairing"
-    )
-}
-
 fn quality_init_mode(args: &[String]) -> Result<QualityInitMode, Box<dyn std::error::Error>> {
     let baseline = args.iter().any(|arg| arg == "--baseline");
     let deep_baseline = args.iter().any(|arg| arg == "--deep-baseline");
@@ -426,23 +425,9 @@ fn quality_init_mode(args: &[String]) -> Result<QualityInitMode, Box<dyn std::er
     })
 }
 
-fn report_json(
-    report: &naome_core::QualityReport,
-    args: &[String],
-) -> Result<String, Box<dyn std::error::Error>> {
-    let mut value = serde_json::to_value(report)?;
-    if !args.iter().any(|arg| arg == "--include-scanned-paths") {
-        if let Some(object) = value.as_object_mut() {
-            object.remove("scannedPaths");
-        }
-    }
-    Ok(serde_json::to_string_pretty(&value)?)
-}
-
-fn print_quality_violation(violation: &naome_core::QualityViolation) {
-    let location = violation
-        .line
-        .map(|line| format!("{}:{line}", violation.path))
-        .unwrap_or_else(|| violation.path.clone());
-    eprintln!("- {location} {}: {}", violation.check_id, violation.message);
+fn option_values(args: &[String], name: &str) -> Vec<String> {
+    args.windows(2)
+        .filter(|window| window[0] == name)
+        .map(|window| window[1].clone())
+        .collect()
 }

package/crates/naome-cli/src/quality_output.rs

@@ -0,0 +1,34 @@
+pub fn report_json(
+    report: &naome_core::QualityReport,
+    args: &[String],
+) -> Result<String, Box<dyn std::error::Error>> {
+    let mut value = serde_json::to_value(report)?;
+    if !args.iter().any(|arg| arg == "--include-scanned-paths") {
+        if let Some(object) = value.as_object_mut() {
+            object.remove("scannedPaths");
+        }
+    }
+    Ok(serde_json::to_string_pretty(&value)?)
+}
+
+pub fn print_quality_violation(violation: &naome_core::QualityViolation) {
+    let location = violation
+        .line
+        .map(|line| format!("{}:{line}", violation.path))
+        .unwrap_or_else(|| violation.path.clone());
+    eprintln!("- {location} {}: {}", violation.check_id, violation.message);
+}
+
+pub fn is_structure_check(check_id: &str) -> bool {
+    matches!(
+        check_id,
+        "directory-role-mixing"
+            | "misplaced-file-role"
+            | "root-file-sprawl"
+            | "dumping-ground-directory"
+            | "directory-size"
+            | "path-depth"
+            | "case-collision"
+            | "test-source-pairing"
+    )
+}

package/crates/naome-cli/src/quality_reconcile_command.rs

@@ -0,0 +1,45 @@
+use std::collections::BTreeSet;
+use std::path::Path;
+
+use naome_core::reconcile_repository_quality;
+
+pub fn run_quality_reconcile(
+    root: &Path,
+    args: &[String],
+    json: bool,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let write = args.iter().any(|arg| arg == "--write");
+    let report = reconcile_repository_quality(root, write)?;
+    if json {
+        println!("{}", serde_json::to_string_pretty(&report)?);
+    } else if report.ok && report.updated_paths.is_empty() {
+        println!("NAOME repository quality adapter policy is current.");
+    } else if report.ok {
+        println!(
+            "NAOME repository quality adapter policy updated: {}",
+            report.updated_paths.join(", ")
+        );
+    } else {
+        eprintln!(
+            "NAOME repository quality adapter policy is stale. Missing adapter(s): {}",
+            missing_adapters(&report)
+        );
+        eprintln!("Run: naome quality reconcile --write");
+    }
+    if !report.ok {
+        std::process::exit(1);
+    }
+    Ok(())
+}
+
+fn missing_adapters(report: &naome_core::QualityReconcileReport) -> String {
+    report
+        .missing_quality_adapters
+        .iter()
+        .chain(report.missing_structure_adapters.iter())
+        .cloned()
+        .collect::<BTreeSet<_>>()
+        .into_iter()
+        .collect::<Vec<_>>()
+        .join(", ")
+}