feat: skills installer codex

Author: MarioCadenas

experimental/aitools/lib/agents/agents.go

@@ -23,6 +23,14 @@ type Agent struct {
 	// ProjectConfigDir is the config directory name relative to a project root
 	// (e.g., ".claude"). Only used when SupportsProjectScope is true.
 	ProjectConfigDir string
+	// PreferSkillCopy when true, installs each skill as a full directory copy
+	// instead of a symlink. Codex uses this so agents/openai.yaml and assets/
+	// resolve reliably under its config dir.
+	PreferSkillCopy bool
+	// InstallAgentMetadata when true, includes agent-specific UI metadata
+	// (agents/openai.yaml, assets/) during installation. Agents that don't
+	// consume these files skip them to keep their skills dirs clean.
+	InstallAgentMetadata bool
 }
 
 // Detected returns true if the agent is installed on the system.
@@ -87,9 +95,11 @@ var Registry = []Agent{
 		ProjectConfigDir:     ".cursor",
 	},
 	{
-		Name:        "codex",
-		DisplayName: "Codex CLI",
-		ConfigDir:   homeSubdir(".codex"),
+		Name:                 "codex",
+		DisplayName:          "Codex CLI",
+		ConfigDir:            homeSubdir(".codex"),
+		PreferSkillCopy:      true,
+		InstallAgentMetadata: true,
 	},
 	{
 		Name:        "opencode",

experimental/aitools/lib/installer/installer.go

@@ -25,7 +25,7 @@ const (
 	skillsRepoOwner      = "databricks"
 	skillsRepoName       = "databricks-agent-skills"
 	skillsRepoPath       = "skills"
-	defaultSkillsRepoRef = "v0.1.3"
+	defaultSkillsRepoRef = "v0.1.4"
 )
 
 // fetchFileFn is the function used to download individual skill files.
@@ -73,9 +73,20 @@ func FetchManifest(ctx context.Context) (*Manifest, error) {
 	return src.FetchManifest(ctx, ref)
 }
 
+// sharedFilePrefix marks files in the manifest that live at the repo root
+// rather than under skills/<name>/. The CLI strips this prefix when writing
+// to disk and adjusts the download URL accordingly.
+const sharedFilePrefix = "@root:"
+
 func fetchSkillFile(ctx context.Context, ref, skillName, filePath string) ([]byte, error) {
-	url := fmt.Sprintf("https://raw.githubusercontent.com/%s/%s/%s/%s/%s/%s",
-		skillsRepoOwner, skillsRepoName, ref, skillsRepoPath, skillName, filePath)
+	var url string
+	if rootPath, ok := strings.CutPrefix(filePath, sharedFilePrefix); ok {
+		url = fmt.Sprintf("https://raw.githubusercontent.com/%s/%s/%s/%s",
+			skillsRepoOwner, skillsRepoName, ref, rootPath)
+	} else {
+		url = fmt.Sprintf("https://raw.githubusercontent.com/%s/%s/%s/%s/%s/%s",
+			skillsRepoOwner, skillsRepoName, ref, skillsRepoPath, skillName, filePath)
+	}
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
@@ -390,14 +401,33 @@ type installParams struct {
 	ref     string
 }
 
+// agentMetadataDirs lists subdirectory prefixes that are agent-specific UI
+// metadata (marketplace icons, display names). Only agents with
+// InstallAgentMetadata=true receive these during a copy install.
+var agentMetadataDirs = []string{"agents", "assets"}
+
+// isAgentMetadataPath reports whether rel (forward-slash separated) falls
+// under one of the agent metadata directories.
+func isAgentMetadataPath(rel string) bool {
+	normalized := filepath.ToSlash(rel)
+	for _, dir := range agentMetadataDirs {
+		if normalized == dir || strings.HasPrefix(normalized, dir+"/") {
+			return true
+		}
+	}
+	return false
+}
+
 func installSkillForAgents(ctx context.Context, skillName string, files []string, detectedAgents []*agents.Agent, params installParams) error {
 	canonicalDir := filepath.Join(params.baseDir, skillName)
 	if err := installSkillToDir(ctx, params.ref, skillName, canonicalDir, files); err != nil {
 		return err
 	}
 
 	// For project scope, always symlink. For global, symlink when multiple agents.
-	useSymlinks := params.scope == ScopeProject || len(detectedAgents) > 1
+	// Agents with PreferSkillCopy always get a full directory copy so
+	// marketplace metadata under agents/ and assets/ stays under their config dir.
+	symlinkEligible := params.scope == ScopeProject || len(detectedAgents) > 1
 
 	for _, agent := range detectedAgents {
 		agentSkillDir, err := agentSkillsDirForScope(ctx, agent, params.scope, params.cwd)
@@ -413,7 +443,8 @@ func installSkillForAgents(ctx context.Context, skillName string, files []string
 			continue
 		}
 
-		if useSymlinks {
+		useSymlink := symlinkEligible && !agent.PreferSkillCopy
+		if useSymlink {
 			symlinkTarget := canonicalDir
 			// For project scope, use relative symlinks so they work for teammates.
 			if params.scope == ScopeProject {
@@ -431,8 +462,10 @@ func installSkillForAgents(ctx context.Context, skillName string, files []string
 			}
 			log.Debugf(ctx, "Installed %q for %s (symlinked)", skillName, agent.DisplayName)
 		} else {
-			// Copy from canonical dir instead of re-downloading.
-			if err := copyDir(canonicalDir, destDir); err != nil {
+			// Copy from canonical dir. Skip agent metadata dirs for agents
+			// that don't consume them.
+			skipMetadata := !agent.InstallAgentMetadata
+			if err := copyDirFiltered(canonicalDir, destDir, skipMetadata); err != nil {
 				log.Warnf(ctx, "Failed to install for %s: %v", agent.DisplayName, err)
 				continue
 			}
@@ -506,7 +539,13 @@ func installSkillToDir(ctx context.Context, ref, skillName, destDir string, file
 			return err
 		}
 
-		destPath := filepath.Join(destDir, file)
+		// Strip the @root: prefix so shared assets land at a local path
+		// (e.g. "@root:assets/databricks.svg" → "assets/databricks.svg").
+		destFile := file
+		if rootPath, ok := strings.CutPrefix(file, sharedFilePrefix); ok {
+			destFile = rootPath
+		}
+		destPath := filepath.Join(destDir, destFile)
 
 		if err := os.MkdirAll(filepath.Dir(destPath), 0o755); err != nil {
 			return fmt.Errorf("failed to create directory: %w", err)
@@ -523,6 +562,13 @@ func installSkillToDir(ctx context.Context, ref, skillName, destDir string, file
 
 // copyDir copies all files from src to dest, recreating the directory structure.
 func copyDir(src, dest string) error {
+	return copyDirFiltered(src, dest, false)
+}
+
+// copyDirFiltered copies files from src to dest. When skipAgentMetadata is
+// true, subdirectories matching agentMetadataDirs (agents/, assets/) are
+// skipped so non-Codex agents don't receive marketplace UI files.
+func copyDirFiltered(src, dest string, skipAgentMetadata bool) error {
 	if err := os.RemoveAll(dest); err != nil {
 		return fmt.Errorf("failed to remove existing path: %w", err)
 	}
@@ -536,6 +582,14 @@ func copyDir(src, dest string) error {
 		if err != nil {
 			return err
 		}
+
+		if skipAgentMetadata && rel != "." && isAgentMetadataPath(rel) {
+			if info.IsDir() {
+				return filepath.SkipDir
+			}
+			return nil
+		}
+
 		target := filepath.Join(dest, rel)
 
 		if info.IsDir() {