feat(skills): scan codex skills root and public

Author: Dimillian

AGENTS.md

@@ -4,7 +4,7 @@
 CodexSkillManager is a small macOS SwiftUI app built with SwiftPM (no Xcode project) that lists the Codex skills installed in the user's public skills folder.
 
 ## How it works
-- The app scans `~/.codex/skills/public` for subdirectories.
+- The app scans `~/.codex/skills` and `~/.codex/skills/public` for subdirectories.
 - Each directory name becomes a skill entry.
 - The UI is a SwiftUI `NavigationSplitView` with a list on the left and a detail view on the right.
 - The detail view shows the skill name and its full path.

README.md

@@ -5,7 +5,7 @@
 Codex Skill Manager is a macOS SwiftUI app built with SwiftPM (no Xcode project). It manages local skills for Codex and Claude Code, renders each `SKILL.md`, and lets you browse remote skills from Clawdhub.
 
 ## Features
-- Browse local skills from `~/.codex/skills/public` and `~/.claude/skills`
+- Browse local skills from `~/.codex/skills`, `~/.codex/skills/public`, and `~/.claude/skills`
 - Render `SKILL.md` with Markdown, plus inline reference previews
 - Import skills from a folder or zip
 - Delete skills from the sidebar

Sources/CodexSkillManager/Skills/Local/SkillStore.swift

@@ -82,8 +82,10 @@ import Observation
         detailState = .idle
         referenceState = .idle
         do {
-            let platforms = SkillPlatform.allCases.map { platform in
-                (platform, platform.rootURL, platform.storageKey)
+            let platforms = SkillPlatform.allCases.flatMap { platform in
+                zip(platform.relativePaths, platform.rootURLs).map { relativePath, rootURL in
+                    (platform, rootURL, platform.storageKey(forRelativePath: relativePath))
+                }
             }
             var skills: [Skill] = []
 
@@ -110,25 +112,26 @@ import Observation
             let fileManager = FileManager.default
             for customPath in customPathStore.customPaths {
                 for platform in SkillPlatform.allCases {
-                    let platformURL = platform.skillsURL(in: customPath.url)
-                    guard fileManager.fileExists(atPath: platformURL.path) else { continue }
-
-                    let storageKey = "\(customPath.storageKey)-\(platform.storageKey)"
-                    let scanned = try await fileWorker.scanSkills(at: platformURL, storageKey: storageKey)
-                    skills.append(contentsOf: scanned.map { scannedSkill in
-                        Skill(
-                            id: scannedSkill.id,
-                            name: scannedSkill.name,
-                            displayName: scannedSkill.displayName,
-                            description: scannedSkill.description,
-                            platform: platform,
-                            customPath: customPath,
-                            folderURL: scannedSkill.folderURL,
-                            skillMarkdownURL: scannedSkill.skillMarkdownURL,
-                            references: scannedSkill.references,
-                            stats: scannedSkill.stats
-                        )
-                    })
+                    for (relativePath, platformURL) in zip(platform.relativePaths, platform.skillsURLs(in: customPath.url)) {
+                        guard fileManager.fileExists(atPath: platformURL.path) else { continue }
+
+                        let storageKey = "\(customPath.storageKey)-\(platform.storageKey(forRelativePath: relativePath))"
+                        let scanned = try await fileWorker.scanSkills(at: platformURL, storageKey: storageKey)
+                        skills.append(contentsOf: scanned.map { scannedSkill in
+                            Skill(
+                                id: scannedSkill.id,
+                                name: scannedSkill.name,
+                                displayName: scannedSkill.displayName,
+                                description: scannedSkill.description,
+                                platform: platform,
+                                customPath: customPath,
+                                folderURL: scannedSkill.folderURL,
+                                skillMarkdownURL: scannedSkill.skillMarkdownURL,
+                                references: scannedSkill.references,
+                                stats: scannedSkill.stats
+                            )
+                        })
+                    }
                 }
             }
 

Sources/CodexSkillManager/Skills/Settings/AddCustomPathView.swift

@@ -49,7 +49,7 @@ struct AddCustomPathView: View {
         VStack(alignment: .leading, spacing: 6) {
             Text("Add Custom Skill Path")
                 .font(.title.bold())
-            Text("Select a project folder. Skills will be auto-discovered from platform directories (e.g., .claude/skills, .codex/skills/public).")
+            Text("Select a project folder. Skills will be auto-discovered from platform directories (e.g., .claude/skills, .codex/skills, .codex/skills/public).")
                 .foregroundStyle(.secondary)
         }
     }
@@ -218,7 +218,7 @@ struct AddCustomPathView: View {
 
             discoveredSkills = discovered
             if discovered.isEmpty {
-                errorMessage = "No skills found. Make sure the folder contains platform directories like .claude/skills or .codex/skills/public with SKILL.md files."
+                errorMessage = "No skills found. Make sure the folder contains platform directories like .claude/skills or .codex/skills (including .codex/skills/public) with SKILL.md files."
             } else {
                 errorMessage = nil
             }

Sources/CodexSkillManager/Skills/Shared/SkillPlatform.swift

@@ -21,17 +21,31 @@ enum SkillPlatform: String, CaseIterable, Identifiable, Hashable, Sendable, Coda
         }
     }
 
-    /// Relative path from a base directory to the skills folder
+    func storageKey(forRelativePath relativePath: String) -> String {
+        guard relativePath != self.relativePath else { return storageKey }
+        let sanitized = relativePath
+            .replacingOccurrences(of: ".", with: "")
+            .replacingOccurrences(of: "/", with: "-")
+            .trimmingCharacters(in: CharacterSet(charactersIn: "-"))
+        return "\(storageKey)-\(sanitized)"
+    }
+
+    /// Primary relative path from a base directory to the skills folder.
     var relativePath: String {
+        relativePaths.first ?? ".codex/skills"
+    }
+
+    /// Relative paths from a base directory to the skills folder(s).
+    var relativePaths: [String] {
         switch self {
         case .codex:
-            return ".codex/skills/public"
+            return [".codex/skills", ".codex/skills/public"]
         case .claude:
-            return ".claude/skills"
+            return [".claude/skills"]
         case .opencode:
-            return ".config/opencode/skill"
+            return [".config/opencode/skill"]
         case .copilot:
-            return ".copilot/skills"
+            return [".copilot/skills"]
         }
     }
 
@@ -40,11 +54,21 @@ enum SkillPlatform: String, CaseIterable, Identifiable, Hashable, Sendable, Coda
         return home.appendingPathComponent(relativePath)
     }
 
+    var rootURLs: [URL] {
+        let home = FileManager.default.homeDirectoryForCurrentUser
+        return relativePaths.map { home.appendingPathComponent($0) }
+    }
+
     /// Returns the skills URL for this platform within a given base directory
     func skillsURL(in baseURL: URL) -> URL {
         baseURL.appendingPathComponent(relativePath)
     }
 
+    /// Returns all skills URLs for this platform within a given base directory
+    func skillsURLs(in baseURL: URL) -> [URL] {
+        relativePaths.map { baseURL.appendingPathComponent($0) }
+    }
+
     var description: String {
         "Install in \(rootURL.path)"
     }

Sources/CodexSkillManager/Skills/SkillSplitView.swift

@@ -219,7 +219,7 @@ struct SkillSplitView: View {
     private func openSelectedSkillFolder(platform: SkillPlatform?) {
         guard source == .local else { return }
         let fallbackURL = FileManager.default.homeDirectoryForCurrentUser
-            .appendingPathComponent(".codex/skills/public")
+            .appendingPathComponent(".codex/skills")
         let selected = store.selectedSkill
         let url: URL
         if let platform, let slug = selected?.name {

Tests/CodexSkillManagerTests/SkillPathPatternTests.swift

@@ -20,11 +20,15 @@ enum TestSkillPlatform: String, CaseIterable {
     }
 
     var relativePath: String {
+        relativePaths.first ?? ".codex/skills"
+    }
+
+    var relativePaths: [String] {
         switch self {
-        case .codex: return ".codex/skills/public"
-        case .claude: return ".claude/skills"
-        case .opencode: return ".config/opencode/skill"
-        case .copilot: return ".copilot/skills"
+        case .codex: return [".codex/skills", ".codex/skills/public"]
+        case .claude: return [".claude/skills"]
+        case .opencode: return [".config/opencode/skill"]
+        case .copilot: return [".copilot/skills"]
         }
     }
 
@@ -36,6 +40,10 @@ enum TestSkillPlatform: String, CaseIterable {
     func skillsURL(in baseURL: URL) -> URL {
         baseURL.appendingPathComponent(relativePath)
     }
+
+    func skillsURLs(in baseURL: URL) -> [URL] {
+        relativePaths.map { baseURL.appendingPathComponent($0) }
+    }
 }
 
 /// Mirrors CustomSkillPath for testing
@@ -79,7 +87,8 @@ struct SkillPlatformPathTests {
 
     @Test("Platform relative paths are correct")
     func platformRelativePaths() {
-        #expect(TestSkillPlatform.codex.relativePath == ".codex/skills/public")
+        #expect(TestSkillPlatform.codex.relativePath == ".codex/skills")
+        #expect(TestSkillPlatform.codex.relativePaths == [".codex/skills", ".codex/skills/public"])
         #expect(TestSkillPlatform.claude.relativePath == ".claude/skills")
         #expect(TestSkillPlatform.opencode.relativePath == ".config/opencode/skill")
         #expect(TestSkillPlatform.copilot.relativePath == ".copilot/skills")
@@ -118,7 +127,14 @@ struct SkillPlatformPathTests {
         )
         #expect(
             TestSkillPlatform.codex.skillsURL(in: customBase).path ==
-            "/Users/test/projects/my-project/.codex/skills/public"
+            "/Users/test/projects/my-project/.codex/skills"
+        )
+        #expect(
+            TestSkillPlatform.codex.skillsURLs(in: customBase).map(\.path) ==
+            [
+                "/Users/test/projects/my-project/.codex/skills",
+                "/Users/test/projects/my-project/.codex/skills/public"
+            ]
         )
         #expect(
             TestSkillPlatform.opencode.skillsURL(in: customBase).path ==
@@ -320,13 +336,13 @@ struct SkillGroupingTests {
             TestSkill(id: "claude-skill1", name: "skill1", platform: .claude, customPath: nil,
                      folderURL: home.appendingPathComponent(".claude/skills/skill1")),
             TestSkill(id: "codex-skill2", name: "skill2", platform: .codex, customPath: nil,
-                     folderURL: home.appendingPathComponent(".codex/skills/public/skill2")),
+                     folderURL: home.appendingPathComponent(".codex/skills/skill2")),
 
             // Custom path skills
             TestSkill(id: "custom-abc-claude-skill3", name: "skill3", platform: .claude, customPath: customPath,
                      folderURL: URL(fileURLWithPath: "/Users/test/projects/my-project/.claude/skills/skill3")),
             TestSkill(id: "custom-abc-codex-skill4", name: "skill4", platform: .codex, customPath: customPath,
-                     folderURL: URL(fileURLWithPath: "/Users/test/projects/my-project/.codex/skills/public/skill4")),
+                     folderURL: URL(fileURLWithPath: "/Users/test/projects/my-project/.codex/skills/skill4")),
         ]
 
         let userDirSkills = skills.filter { $0.isFromUserDirectory }
@@ -383,7 +399,7 @@ struct SidebarPlatformGroupingTests {
             name: "my-skill",
             platform: .codex,
             customPath: customPath,
-            folderURL: URL(fileURLWithPath: "/Users/test/projects/my-project/.codex/skills/public/my-skill")
+            folderURL: URL(fileURLWithPath: "/Users/test/projects/my-project/.codex/skills/my-skill")
         )
 
         let groupedAll = groupedLocalSkills(from: [userDirSkill, customPathSkill])