fix: recognize Claude plugin skill ownership

Author: avifenesh

crates/agnix-core/src/rules/per_client_skill.rs

@@ -119,6 +119,35 @@ pub(crate) fn detect_client(path: &Path) -> SkillClient {
     SkillClient::Unknown
 }
 
+/// Return whether `path` is a skill owned by a Claude Code plugin.
+///
+/// Claude plugins may expose either a root `SKILL.md` or skills below the
+/// plugin's `skills/` directory. Require the documented sibling manifest so a
+/// generic `skills/foo/SKILL.md` tree is not misclassified as Claude-owned.
+fn is_claude_plugin_skill(path: &Path, config: &LintConfig) -> bool {
+    let Some(parent) = path.parent() else {
+        return false;
+    };
+
+    let has_manifest = |root: &Path| {
+        config
+            .fs()
+            .is_file(&root.join(".claude-plugin").join("plugin.json"))
+    };
+
+    if path.file_name().and_then(|name| name.to_str()) == Some("SKILL.md") && has_manifest(parent) {
+        return true;
+    }
+
+    for ancestor in parent.ancestors() {
+        if ancestor.file_name().and_then(|name| name.to_str()) == Some("skills") {
+            return ancestor.parent().is_some_and(has_manifest);
+        }
+    }
+
+    false
+}
+
 /// Map a `tools = [...]` entry (or `--tools` value) to a [`SkillClient`].
 /// Matching is case-insensitive to tolerate configs that use different casing.
 fn skill_client_from_tool_str(tool: &str) -> Option<SkillClient> {
@@ -151,6 +180,9 @@ pub(crate) fn resolve_skill_client(path: &Path, config: &LintConfig) -> SkillCli
     if by_path != SkillClient::Unknown {
         return by_path;
     }
+    if is_claude_plugin_skill(path, config) {
+        return SkillClient::ClaudeCode;
+    }
 
     let mut from_tools = config
         .tools()
@@ -437,6 +469,7 @@ mod tests {
     use super::*;
     use crate::config::LintConfig;
     use crate::rules::Validator;
+    use std::fs;
 
     fn make_skill(frontmatter: &str, body: &str) -> String {
         format!("---\n{}\n---\n{}", frontmatter, body)
@@ -552,6 +585,39 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_resolve_skill_client_claude_plugin_layouts() {
+        let temp = tempfile::tempdir().unwrap();
+        let plugin_root = temp.path().join("my-plugin");
+        let manifest = plugin_root.join(".claude-plugin").join("plugin.json");
+        fs::create_dir_all(manifest.parent().unwrap()).unwrap();
+        fs::write(&manifest, "{}").unwrap();
+
+        assert_eq!(
+            resolve_skill_client(
+                &plugin_root.join("skills/review/SKILL.md"),
+                &LintConfig::default()
+            ),
+            SkillClient::ClaudeCode
+        );
+        assert_eq!(
+            resolve_skill_client(&plugin_root.join("SKILL.md"), &LintConfig::default()),
+            SkillClient::ClaudeCode
+        );
+    }
+
+    #[test]
+    fn test_resolve_skill_client_generic_skills_without_plugin_manifest() {
+        let temp = tempfile::tempdir().unwrap();
+        assert_eq!(
+            resolve_skill_client(
+                &temp.path().join("skills/review/SKILL.md"),
+                &LintConfig::default()
+            ),
+            SkillClient::Unknown
+        );
+    }
+
     // ===== Validation tests =====
 
     #[test]

crates/agnix-core/src/rules/skill/mod.rs

@@ -1930,6 +1930,26 @@ fn is_valid_skill_tool_name(tool: &str) -> bool {
     is_valid_mcp_tool_format(tool, KNOWN_TOOLS)
 }
 
+/// Derive Claude Code's command name when frontmatter omits `name`.
+///
+/// Directory-based skills use the directory name, including plugin-root
+/// `SKILL.md` files. Legacy command files use their Markdown file stem.
+fn derived_claude_skill_name(path: &Path) -> String {
+    if path.file_name().and_then(|name| name.to_str()) == Some("SKILL.md") {
+        return path
+            .parent()
+            .and_then(Path::file_name)
+            .and_then(|name| name.to_str())
+            .unwrap_or_default()
+            .to_string();
+    }
+
+    path.file_stem()
+        .and_then(|name| name.to_str())
+        .unwrap_or_default()
+        .to_string()
+}
+
 impl Validator for SkillValidator {
     fn metadata(&self) -> ValidatorMetadata {
         ValidatorMetadata {
@@ -2016,9 +2036,10 @@ impl Validator for SkillValidator {
                 name: frontmatter
                     .name
                     .as_deref()
-                    .unwrap_or_default()
-                    .trim()
-                    .to_string(),
+                    .map(str::trim)
+                    .filter(|name| !name.is_empty())
+                    .map(str::to_string)
+                    .unwrap_or_else(|| derived_claude_skill_name(path)),
                 description: frontmatter
                     .description
                     .as_deref()

crates/agnix-core/src/rules/skill/tests.rs

@@ -98,6 +98,30 @@ Use the directory name as the command and this paragraph as the description."#;
     );
 }
 
+#[test]
+fn test_claude_plugin_skill_allows_missing_name_and_description() {
+    let temp = tempfile::tempdir().unwrap();
+    let plugin_root = temp.path().join("my-plugin");
+    let manifest = plugin_root.join(".claude-plugin").join("plugin.json");
+    let skill_path = plugin_root.join("skills/review/SKILL.md");
+    fs::create_dir_all(manifest.parent().unwrap()).unwrap();
+    fs::create_dir_all(skill_path.parent().unwrap()).unwrap();
+    fs::write(&manifest, "{}").unwrap();
+
+    let diagnostics = SkillValidator.validate(
+        &skill_path,
+        "---\n---\nReview the current changes.",
+        &LintConfig::default(),
+    );
+
+    assert!(
+        diagnostics
+            .iter()
+            .all(|d| d.rule != "AS-002" && d.rule != "AS-003"),
+        "manifest-owned plugin skills use Claude's optional-field contract: {diagnostics:?}"
+    );
+}
+
 #[test]
 fn test_as_004_invalid_name_format() {
     let content = r#"---
@@ -508,6 +532,28 @@ Body"#;
     );
 }
 
+#[test]
+fn test_cc_sk_006_uses_directory_name_when_frontmatter_omits_name() {
+    let content = r#"---
+description: Deploys to production
+---
+Body"#;
+
+    let diagnostics = SkillValidator.validate(
+        Path::new(".claude/skills/deploy-prod/SKILL.md"),
+        content,
+        &LintConfig::default(),
+    );
+
+    let hits: Vec<_> = diagnostics
+        .iter()
+        .filter(|d| d.rule == "CC-SK-006")
+        .collect();
+    assert_eq!(hits.len(), 1);
+    assert!(hits[0].message.contains("deploy-prod"));
+    assert!(!diagnostics.iter().any(|d| d.rule == "AS-002"));
+}
+
 #[test]
 fn test_cc_sk_006_dangerous_name_with_safety() {
     let content = r#"---