Reuse skill functions for root case

Signed-off-by: Gorkem Ercan <gorkem.ercan@gmail.com>

Author: gorkem

pkg/lib/kitfile/generate/generate.go

@@ -94,13 +94,12 @@ func GenerateKitfile(dir *DirectoryListing, packageOpt *artifact.Package) (*arti
 		kitfile.Package = *packageOpt
 	}
 
-	//  SKILL.md: found at ROOT treat entire directory as a skill
-	if found, skillPath := dirContainsSkillMD(*dir); found {
+	// SKILL.md at root: treat entire directory as a single skill
+	if found, _ := dirContainsSkillMD(*dir); found {
 		output.Logf(output.LogLevelTrace, "SKILL.md found; treating as a skill directory")
-		prompt := artifact.Prompt{Path: "."}
-		if fm := parseSkillFrontmatter(skillPath); fm != nil {
-			prompt.Name = fm.Name
-			prompt.Description = fm.Description
+		prompt, fm := buildPromptFromSkill(*dir)
+		kitfile.Prompts = append(kitfile.Prompts, prompt)
+		if fm != nil {
 			if kitfile.Package.Name == "" {
 				kitfile.Package.Name = fm.Name
 			}
@@ -111,7 +110,6 @@ func GenerateKitfile(dir *DirectoryListing, packageOpt *artifact.Package) (*arti
 				kitfile.Package.License = fm.License
 			}
 		}
-		kitfile.Prompts = append(kitfile.Prompts, prompt)
 		return kitfile, nil
 	}
 
@@ -240,7 +238,7 @@ func GenerateKitfile(dir *DirectoryListing, packageOpt *artifact.Package) (*arti
 func addDirToKitfile(kitfile *artifact.KitFile, dir DirectoryListing) (modelFiles []FileListing, err error) {
 	if found, _ := dirContainsSkillMD(dir); found {
 		output.Logf(output.LogLevelTrace, "Directory %s contains SKILL.md; treating as skill", dir.Path)
-		prompt := buildPromptFromSkill(dir)
+		prompt, _ := buildPromptFromSkill(dir)
 		kitfile.Prompts = append(kitfile.Prompts, prompt)
 		return nil, nil
 	}

pkg/lib/kitfile/generate/skill.go

@@ -78,22 +78,22 @@ func dirContainsSkillMD(dir DirectoryListing) (bool, string) {
 	return false, ""
 }
 
-func buildPromptFromSkill(dir DirectoryListing) artifact.Prompt {
+func buildPromptFromSkill(dir DirectoryListing) (artifact.Prompt, *SkillFrontmatter) {
 	prompt := artifact.Prompt{
 		Path: dir.Path,
 	}
 
 	found, skillPath := dirContainsSkillMD(dir)
 	if !found {
-		return prompt
+		return prompt, nil
 	}
 
 	fm := parseSkillFrontmatter(skillPath)
 	if fm != nil {
 		prompt.Name = fm.Name
 		prompt.Description = fm.Description
 	}
-	return prompt
+	return prompt, fm
 }
 
 func applySkillMetadataToPackage(kitfile *artifact.KitFile, dir DirectoryListing) {
@@ -110,7 +110,12 @@ func applySkillMetadataToPackage(kitfile *artifact.KitFile, dir DirectoryListing
 		return
 	}
 
-	if len(skillFrontmatters) == 1 {
+	// Only promote name/description when the Kitfile contains exclusively
+	// prompt layers. A mixed Kitfile (model + skill) should not inherit the
+	// skill's name as the package name.
+	hasOnlyPrompts := kitfile.Model == nil && len(kitfile.Code) == 0 &&
+		len(kitfile.DataSets) == 0 && len(kitfile.Docs) == 0
+	if hasOnlyPrompts && len(skillFrontmatters) == 1 {
 		fm := skillFrontmatters[0]
 		if kitfile.Package.Name == "" {
 			kitfile.Package.Name = fm.Name

pkg/lib/kitfile/generate/skill_test.go

@@ -183,7 +183,7 @@ func TestBuildPromptFromSkill(t *testing.T) {
 		},
 	}
 
-	prompt := buildPromptFromSkill(dir)
+	prompt, _ := buildPromptFromSkill(dir)
 	if prompt.Path != "myskill" {
 		t.Errorf("Path = %q, want %q", prompt.Path, "myskill")
 	}
@@ -401,6 +401,10 @@ func TestGenerateKitfile_MultiSkillMixedDirs(t *testing.T) {
 	if len(kitfile.Docs) != 1 {
 		t.Fatalf("expected 1 docs layer, got %d", len(kitfile.Docs))
 	}
+	// Mixed content: skill name should NOT be promoted to package
+	if kitfile.Package.Name != "" {
+		t.Errorf("package name should be empty for mixed content, got %q", kitfile.Package.Name)
+	}
 }
 
 func TestGenerateKitfile_RootSkillOverridesSubdir(t *testing.T) {