Skip to content

Add untracked local file detection #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eljulians wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add untracked local file detection #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1372525
Add untracked local file detection
eljulians Mar 28, 2026
4bb7645
Review fixes for untracked local detection
eljulians Mar 30, 2026
05e2be3
Replace is_dir bool with UntrackedKind enum
eljulians Mar 30, 2026
b0937b2
Fix false positives in untracked detection
eljulians Mar 30, 2026
248d192
Polish untracked detection after adversarial review
eljulians Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 29 additions & 7 deletions crates/cli/src/commands/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,11 @@ fn format_entry_status(
Ok(format!("{name:<col_w$} {base_status}{annotation}"))
}

pub fn cmd_status(repo_root: &Path, check_upstream: bool) -> Result<(), SkillfileError> {
pub fn cmd_status(
repo_root: &Path,
check_upstream: bool,
show_untracked: bool,
) -> Result<(), SkillfileError> {
let manifest_path = repo_root.join(MANIFEST_NAME);
if !manifest_path.exists() {
return Err(SkillfileError::Manifest(format!(
Expand Down Expand Up @@ -235,6 +239,24 @@ pub fn cmd_status(repo_root: &Path, check_upstream: bool) -> Result<(), Skillfil
println!("{line}");
}

if show_untracked {
print_untracked(&manifest, repo_root)?;
}

Ok(())
}

fn print_untracked(manifest: &Manifest, repo_root: &Path) -> Result<(), SkillfileError> {
let untracked = skillfile_deploy::paths::find_untracked(manifest, repo_root)?;
if untracked.is_empty() {
return Ok(());
}
println!();
println!("Untracked:");
for f in &untracked {
let suffix = f.kind.suffix();
println!(" {} {}{suffix}", f.entity_type, f.path.display());
}
Ok(())
}

Expand Down Expand Up @@ -343,7 +365,7 @@ mod tests {
#[test]
fn no_manifest() {
let dir = tempfile::tempdir().unwrap();
let result = cmd_status(dir.path(), false);
let result = cmd_status(dir.path(), false, false);
assert!(result.is_err());
assert!(result.unwrap_err().to_string().contains("not found"));
}
Expand All @@ -355,15 +377,15 @@ mod tests {
std::fs::create_dir_all(source.parent().unwrap()).unwrap();
std::fs::write(&source, "# Foo").unwrap();
write_manifest(dir.path(), "local skill foo skills/foo.md\n");
cmd_status(dir.path(), false).unwrap();
cmd_status(dir.path(), false, false).unwrap();
}

#[test]
fn local_entry_path_missing_shows_status_without_error() {
let dir = tempfile::tempdir().unwrap();
write_manifest(dir.path(), "local skill foo skills/foo.md\n");
// Missing path should not cause an error — status reports it inline
cmd_status(dir.path(), false).unwrap();
cmd_status(dir.path(), false, false).unwrap();
}

#[test]
Expand All @@ -373,7 +395,7 @@ mod tests {
dir.path(),
"github agent my-agent owner/repo agents/agent.md main\n",
);
cmd_status(dir.path(), false).unwrap();
cmd_status(dir.path(), false, false).unwrap();
}

#[test]
Expand All @@ -389,7 +411,7 @@ mod tests {
&serde_json::json!({"github/agent/my-agent": {"sha": sha, "raw_url": "https://example.com"}}),
);
write_meta(dir.path(), &VE_AGENT, sha);
cmd_status(dir.path(), false).unwrap();
cmd_status(dir.path(), false, false).unwrap();
}

#[test]
Expand All @@ -405,7 +427,7 @@ mod tests {
&serde_json::json!({"github/agent/my-agent": {"sha": sha, "raw_url": "https://example.com"}}),
);
// No .meta written
cmd_status(dir.path(), false).unwrap();
cmd_status(dir.path(), false, false).unwrap();
}

#[test]
Expand Down
103 changes: 88 additions & 15 deletions crates/cli/src/commands/validate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use skillfile_core::lock::{lock_key, read_lock};
use skillfile_core::models::{Manifest, Scope, SourceFields};
use skillfile_core::parser::{parse_manifest, MANIFEST_NAME};
use skillfile_deploy::adapter::adapters;
use skillfile_deploy::paths::{find_untracked, UntrackedFile};

fn check_duplicate_names(manifest: &Manifest, errors: &mut Vec<String>) {
let mut seen: HashMap<String, String> = HashMap::new();
Expand Down Expand Up @@ -79,7 +80,32 @@ fn check_orphaned_locks(
Ok(())
}

pub fn cmd_validate(repo_root: &Path) -> Result<(), SkillfileError> {
fn print_untracked_warnings(
untracked: &[UntrackedFile],
strict: bool,
) -> Result<(), SkillfileError> {
if untracked.is_empty() {
return Ok(());
}
let prefix = if strict { "error" } else { "warning" };
eprintln!("{prefix}: untracked files in install targets:");
for f in untracked {
let entity = f.entity_type;
let path = f.path.display();
let suffix = f.kind.suffix();
eprintln!(" {entity} {path}{suffix} (add: skillfile add local {entity} {path})");
}
if strict {
eprintln!(
"\n{} untracked file(s). Add to Skillfile or remove from disk.",
untracked.len()
);
return Err(SkillfileError::Manifest(String::new()));
}
Ok(())
}

pub fn cmd_validate(repo_root: &Path, strict: bool) -> Result<(), SkillfileError> {
let manifest_path = repo_root.join(MANIFEST_NAME);
if !manifest_path.exists() {
return Err(SkillfileError::Manifest(format!(
Expand Down Expand Up @@ -108,11 +134,19 @@ pub fn cmd_validate(repo_root: &Path) -> Result<(), SkillfileError> {
return Err(SkillfileError::Manifest(String::new()));
}

let untracked = find_untracked(&manifest, repo_root)?;
print_untracked_warnings(&untracked, strict)?;

let n = manifest.entries.len();
let t = manifest.install_targets.len();
let entry_word = if n == 1 { "entry" } else { "entries" };
let target_word = if t == 1 { "target" } else { "targets" };
println!("Skillfile OK — {n} {entry_word}, {t} install {target_word}");
let untracked_suffix = if untracked.is_empty() {
String::new()
} else {
format!(" ({} untracked)", untracked.len())
};
println!("Skillfile OK — {n} {entry_word}, {t} install {target_word}{untracked_suffix}");

Ok(())
}
Expand All @@ -128,7 +162,7 @@ mod tests {
#[test]
fn no_manifest() {
let dir = tempfile::tempdir().unwrap();
let result = cmd_validate(dir.path());
let result = cmd_validate(dir.path(), false);
assert!(result.is_err());
assert!(result.unwrap_err().to_string().contains("not found"));
}
Expand All @@ -137,14 +171,14 @@ mod tests {
fn valid_empty_manifest() {
let dir = tempfile::tempdir().unwrap();
write_manifest(dir.path(), "");
cmd_validate(dir.path()).unwrap();
cmd_validate(dir.path(), false).unwrap();
}

#[test]
fn valid_github_entry() {
let dir = tempfile::tempdir().unwrap();
write_manifest(dir.path(), "github agent owner/repo agents/agent.md\n");
cmd_validate(dir.path()).unwrap();
cmd_validate(dir.path(), false).unwrap();
}

#[test]
Expand All @@ -154,14 +188,14 @@ mod tests {
std::fs::create_dir_all(source.parent().unwrap()).unwrap();
std::fs::write(&source, "# Foo").unwrap();
write_manifest(dir.path(), "local skill skills/foo.md\n");
cmd_validate(dir.path()).unwrap();
cmd_validate(dir.path(), false).unwrap();
}

#[test]
fn valid_with_known_install_target() {
let dir = tempfile::tempdir().unwrap();
write_manifest(dir.path(), "install claude-code global\n");
cmd_validate(dir.path()).unwrap();
cmd_validate(dir.path(), false).unwrap();
}

#[test]
Expand All @@ -171,23 +205,23 @@ mod tests {
dir.path(),
"local skill skills/foo.md\ngithub agent owner/repo skills/foo.md\n",
);
let result = cmd_validate(dir.path());
let result = cmd_validate(dir.path(), false);
assert!(result.is_err());
}

#[test]
fn missing_local_path_errors() {
let dir = tempfile::tempdir().unwrap();
write_manifest(dir.path(), "local skill skills/nonexistent.md\n");
let result = cmd_validate(dir.path());
let result = cmd_validate(dir.path(), false);
assert!(result.is_err());
}

#[test]
fn unknown_platform_errors() {
let dir = tempfile::tempdir().unwrap();
write_manifest(dir.path(), "install unknown-platform global\n");
let result = cmd_validate(dir.path());
let result = cmd_validate(dir.path(), false);
assert!(result.is_err());
}

Expand All @@ -198,7 +232,7 @@ mod tests {
dir.path(),
"install unknown-platform global\nlocal skill skills/missing.md\n",
);
let result = cmd_validate(dir.path());
let result = cmd_validate(dir.path(), false);
assert!(result.is_err());
}

Expand All @@ -209,7 +243,7 @@ mod tests {
dir.path(),
"install claude-code global\ninstall claude-code global\n",
);
let result = cmd_validate(dir.path());
let result = cmd_validate(dir.path(), false);
assert!(result.is_err());
}

Expand All @@ -220,7 +254,7 @@ mod tests {
dir.path(),
"install claude-code global\ninstall claude-code local\n",
);
cmd_validate(dir.path()).unwrap();
cmd_validate(dir.path(), false).unwrap();
}

#[test]
Expand All @@ -238,7 +272,7 @@ mod tests {
serde_json::to_string_pretty(&lock_data).unwrap(),
)
.unwrap();
let result = cmd_validate(dir.path());
let result = cmd_validate(dir.path(), false);
assert!(result.is_err());
}

Expand All @@ -254,6 +288,45 @@ mod tests {
serde_json::to_string_pretty(&lock_data).unwrap(),
)
.unwrap();
cmd_validate(dir.path()).unwrap();
cmd_validate(dir.path(), false).unwrap();
}

#[test]
fn untracked_files_warn_but_pass() {
let dir = tempfile::tempdir().unwrap();
write_manifest(dir.path(), "install claude-code local\n");
let agents = dir.path().join(".claude/agents");
std::fs::create_dir_all(&agents).unwrap();
std::fs::write(agents.join("rogue.md"), "# rogue").unwrap();

// Without strict, untracked files are warnings only → Ok
cmd_validate(dir.path(), false).unwrap();
}

#[test]
fn untracked_files_strict_fails() {
let dir = tempfile::tempdir().unwrap();
write_manifest(dir.path(), "install claude-code local\n");
let agents = dir.path().join(".claude/agents");
std::fs::create_dir_all(&agents).unwrap();
std::fs::write(agents.join("rogue.md"), "# rogue").unwrap();

let result = cmd_validate(dir.path(), true);
assert!(result.is_err());
}

#[test]
fn no_untracked_no_warnings() {
let dir = tempfile::tempdir().unwrap();
write_manifest(
dir.path(),
"github agent owner/repo agents/helper.md\ninstall claude-code local\n",
);
let agents = dir.path().join(".claude/agents");
std::fs::create_dir_all(&agents).unwrap();
std::fs::write(agents.join("helper.md"), "# tracked").unwrap();

// Validate should pass cleanly
cmd_validate(dir.path(), false).unwrap();
}
}
Loading
Loading