Solution for long term memory for agent coding CLIs and to facilitate handoff between different agent vendors
Rust
Preflight skill conflicts before installing instructions
Thiago Silva33a35bef99be
diff --git a/crates/ai-memory-cli/src/commands/install_instructions.rs b/crates/ai-memory-cli/src/commands/install_instructions.rsindex 47c723cb..4839d9d2 100644--- a/crates/ai-memory-cli/src/commands/install_instructions.rs+++ b/crates/ai-memory-cli/src/commands/install_instructions.rs@@ -37,6 +37,11 @@ use ai_memory_core::{MARKER_END, MARKER_START, full_block};pub fn run(config: &Config, args: InstallInstructionsArgs) -> Result<()> {let block = full_block();let targets = resolve_targets(args.target.as_ref())?;+ let skill_args = if args.no_skills {+ None+ } else {+ Some(skill_args_from_instruction_args(&args, &targets))+ };if args.print {for t in &targets {@@ -44,6 +49,9 @@ pub fn run(config: &Config, args: InstallInstructionsArgs) -> Result<()> {println!("{block}");}} else {+ if let Some(skill_args) = &skill_args {+ install_skills::preflight_overwrite_safety(skill_args)?;+ }for target in &targets {let outcome = apply_atomic(target, |existing| {Ok(merge_instructions_block(existing, &block))@@ -61,8 +69,8 @@ pub fn run(config: &Config, args: InstallInstructionsArgs) -> Result<()> {}}- if !args.no_skills {- install_skills::run(config, skill_args_from_instruction_args(&args, &targets))?;+ if let Some(skill_args) = skill_args {+ install_skills::run(config, skill_args)?;}Ok(())diff --git a/crates/ai-memory-cli/src/commands/install_skills.rs b/crates/ai-memory-cli/src/commands/install_skills.rsindex f5779e17..a17eeeaa 100644--- a/crates/ai-memory-cli/src/commands/install_skills.rs+++ b/crates/ai-memory-cli/src/commands/install_skills.rs@@ -34,9 +34,7 @@ struct InstallReport {/// same-name skill would be overwritten without `--force`, or a skill/// file cannot be written.pub fn run(_config: &Config, args: InstallSkillsArgs) -> Result<()> {- let cwd = std::env::current_dir().context("getting CWD for install-skills target")?;- let home = dirs::home_dir();- let roots = resolve_target_roots(&args, &cwd, home.as_deref())?;+ let roots = resolve_target_roots_from_env(&args)?;if args.print {print_install_plan(&roots);@@ -55,6 +53,18 @@ pub fn run(_config: &Config, args: InstallSkillsArgs) -> Result<()> {Ok(())}+pub(super) fn preflight_overwrite_safety(args: &InstallSkillsArgs) -> Result<()> {+ let roots = resolve_target_roots_from_env(args)?;+ let plans = skill_file_plans(&roots);+ validate_overwrite_safety(&plans, args.force)+}++fn resolve_target_roots_from_env(args: &InstallSkillsArgs) -> Result<Vec<TargetRoot>> {+ let cwd = std::env::current_dir().context("getting CWD for install-skills target")?;+ let home = dirs::home_dir();+ resolve_target_roots(args, &cwd, home.as_deref())+}+fn resolve_target_roots(args: &InstallSkillsArgs,cwd: &Path,diff --git a/crates/ai-memory-cli/tests/install_instructions.rs b/crates/ai-memory-cli/tests/install_instructions.rsindex 0687aa9b..578f320f 100644--- a/crates/ai-memory-cli/tests/install_instructions.rs+++ b/crates/ai-memory-cli/tests/install_instructions.rs@@ -29,6 +29,62 @@ fn assert_success(output: Output) -> String {String::from_utf8(output.stdout).unwrap()}+fn assert_failure(output: Output) -> String {+ assert!(+ !output.status.success(),+ "command unexpectedly succeeded\nstdout:\n{}\nstderr:\n{}",+ String::from_utf8_lossy(&output.stdout),+ String::from_utf8_lossy(&output.stderr)+ );+ String::from_utf8(output.stderr).unwrap()+}++#[test]+fn skill_conflict_preflight_keeps_instruction_file_unchanged_until_force() {+ let project = tempfile::tempdir().unwrap();+ let home = tempfile::tempdir().unwrap();+ let target = project.path().join("CLAUDE.md");+ let original = b"# Project\n\nKeep this exact.\n".to_vec();+ fs::write(&target, &original).unwrap();++ let unmanaged = project+ .path()+ .join(".claude/skills/ai-memory-retrieval/SKILL.md");+ let unmanaged_content = b"---\nname: ai-memory-retrieval\n---\nuser skill\n".to_vec();+ fs::create_dir_all(unmanaged.parent().unwrap()).unwrap();+ fs::write(&unmanaged, &unmanaged_content).unwrap();++ let output = run_ai_memory(project.path(), home.path(), &["install-instructions"]);+ let stderr = assert_failure(output);+ assert!(stderr.contains("refusing to overwrite unmanaged skill"));+ assert_eq!(fs::read(&target).unwrap(), original);+ assert_eq!(fs::read(&unmanaged).unwrap(), unmanaged_content);+ assert!(+ !project+ .path()+ .join(".claude/skills/ai-memory-handoff/SKILL.md")+ .exists()+ );++ let output = run_ai_memory(+ project.path(),+ home.path(),+ &["install-instructions", "--skills-force"],+ );+ assert_success(output);++ let updated = fs::read_to_string(&target).unwrap();+ assert!(updated.contains(MARKER_START));+ assert!(updated.contains("# Project"));+ assert!(fs::read_to_string(&unmanaged).unwrap().contains(MANAGED_MARKER));+ assert!(+ project+ .path()+ .join(".claude/skills/ai-memory-handoff/SKILL.md")+ .exists()+ );+}+#[test]fn no_skills_writes_only_instruction_snippet() {let project = tempfile::tempdir().unwrap();