Add discoverProjectAgentsSkills() for project-level .agents/skills/ and discoverGlobalAgentsSkills() for ~/.agents/skills/ — matching OpenCode's native skill discovery paths (https://opencode.ai/docs/skills/). Updated discoverAllSkills(), discoverSkills(), and createSkillContext() to include these new sources with correct priority ordering. Co-authored-by: dtateks <dtateks@users.noreply.github.com> Closes #1818
129 lines
5.4 KiB
TypeScript
129 lines
5.4 KiB
TypeScript
import { join } from "path"
|
|
import { homedir } from "os"
|
|
import { getClaudeConfigDir } from "../../shared/claude-config-dir"
|
|
import { getOpenCodeConfigDir } from "../../shared/opencode-config-dir"
|
|
import type { CommandDefinition } from "../claude-code-command-loader/types"
|
|
import type { LoadedSkill } from "./types"
|
|
import { skillsToCommandDefinitionRecord } from "./skill-definition-record"
|
|
import { deduplicateSkillsByName } from "./skill-deduplication"
|
|
import { loadSkillsFromDir } from "./skill-directory-loader"
|
|
|
|
export async function loadUserSkills(): Promise<Record<string, CommandDefinition>> {
|
|
const userSkillsDir = join(getClaudeConfigDir(), "skills")
|
|
const skills = await loadSkillsFromDir({ skillsDir: userSkillsDir, scope: "user" })
|
|
return skillsToCommandDefinitionRecord(skills)
|
|
}
|
|
|
|
export async function loadProjectSkills(directory?: string): Promise<Record<string, CommandDefinition>> {
|
|
const projectSkillsDir = join(directory ?? process.cwd(), ".claude", "skills")
|
|
const skills = await loadSkillsFromDir({ skillsDir: projectSkillsDir, scope: "project" })
|
|
return skillsToCommandDefinitionRecord(skills)
|
|
}
|
|
|
|
export async function loadOpencodeGlobalSkills(): Promise<Record<string, CommandDefinition>> {
|
|
const configDir = getOpenCodeConfigDir({ binary: "opencode" })
|
|
const opencodeSkillsDir = join(configDir, "skills")
|
|
const skills = await loadSkillsFromDir({ skillsDir: opencodeSkillsDir, scope: "opencode" })
|
|
return skillsToCommandDefinitionRecord(skills)
|
|
}
|
|
|
|
export async function loadOpencodeProjectSkills(directory?: string): Promise<Record<string, CommandDefinition>> {
|
|
const opencodeProjectDir = join(directory ?? process.cwd(), ".opencode", "skills")
|
|
const skills = await loadSkillsFromDir({ skillsDir: opencodeProjectDir, scope: "opencode-project" })
|
|
return skillsToCommandDefinitionRecord(skills)
|
|
}
|
|
|
|
export interface DiscoverSkillsOptions {
|
|
includeClaudeCodePaths?: boolean
|
|
directory?: string
|
|
}
|
|
|
|
export async function discoverAllSkills(directory?: string): Promise<LoadedSkill[]> {
|
|
const [opencodeProjectSkills, opencodeGlobalSkills, projectSkills, userSkills, agentsProjectSkills, agentsGlobalSkills] =
|
|
await Promise.all([
|
|
discoverOpencodeProjectSkills(directory),
|
|
discoverOpencodeGlobalSkills(),
|
|
discoverProjectClaudeSkills(directory),
|
|
discoverUserClaudeSkills(),
|
|
discoverProjectAgentsSkills(directory),
|
|
discoverGlobalAgentsSkills(),
|
|
])
|
|
|
|
// Priority: opencode-project > opencode > project (.claude + .agents) > user (.claude + .agents)
|
|
return deduplicateSkillsByName([
|
|
...opencodeProjectSkills,
|
|
...opencodeGlobalSkills,
|
|
...projectSkills,
|
|
...agentsProjectSkills,
|
|
...userSkills,
|
|
...agentsGlobalSkills,
|
|
])
|
|
}
|
|
|
|
export async function discoverSkills(options: DiscoverSkillsOptions = {}): Promise<LoadedSkill[]> {
|
|
const { includeClaudeCodePaths = true, directory } = options
|
|
|
|
const [opencodeProjectSkills, opencodeGlobalSkills] = await Promise.all([
|
|
discoverOpencodeProjectSkills(directory),
|
|
discoverOpencodeGlobalSkills(),
|
|
])
|
|
|
|
if (!includeClaudeCodePaths) {
|
|
// Priority: opencode-project > opencode
|
|
return deduplicateSkillsByName([...opencodeProjectSkills, ...opencodeGlobalSkills])
|
|
}
|
|
|
|
const [projectSkills, userSkills, agentsProjectSkills, agentsGlobalSkills] = await Promise.all([
|
|
discoverProjectClaudeSkills(directory),
|
|
discoverUserClaudeSkills(),
|
|
discoverProjectAgentsSkills(directory),
|
|
discoverGlobalAgentsSkills(),
|
|
])
|
|
|
|
// Priority: opencode-project > opencode > project (.claude + .agents) > user (.claude + .agents)
|
|
return deduplicateSkillsByName([
|
|
...opencodeProjectSkills,
|
|
...opencodeGlobalSkills,
|
|
...projectSkills,
|
|
...agentsProjectSkills,
|
|
...userSkills,
|
|
...agentsGlobalSkills,
|
|
])
|
|
}
|
|
|
|
export async function getSkillByName(name: string, options: DiscoverSkillsOptions = {}): Promise<LoadedSkill | undefined> {
|
|
const skills = await discoverSkills(options)
|
|
return skills.find(s => s.name === name)
|
|
}
|
|
|
|
export async function discoverUserClaudeSkills(): Promise<LoadedSkill[]> {
|
|
const userSkillsDir = join(getClaudeConfigDir(), "skills")
|
|
return loadSkillsFromDir({ skillsDir: userSkillsDir, scope: "user" })
|
|
}
|
|
|
|
export async function discoverProjectClaudeSkills(directory?: string): Promise<LoadedSkill[]> {
|
|
const projectSkillsDir = join(directory ?? process.cwd(), ".claude", "skills")
|
|
return loadSkillsFromDir({ skillsDir: projectSkillsDir, scope: "project" })
|
|
}
|
|
|
|
export async function discoverOpencodeGlobalSkills(): Promise<LoadedSkill[]> {
|
|
const configDir = getOpenCodeConfigDir({ binary: "opencode" })
|
|
const opencodeSkillsDir = join(configDir, "skills")
|
|
return loadSkillsFromDir({ skillsDir: opencodeSkillsDir, scope: "opencode" })
|
|
}
|
|
|
|
export async function discoverOpencodeProjectSkills(directory?: string): Promise<LoadedSkill[]> {
|
|
const opencodeProjectDir = join(directory ?? process.cwd(), ".opencode", "skills")
|
|
return loadSkillsFromDir({ skillsDir: opencodeProjectDir, scope: "opencode-project" })
|
|
}
|
|
|
|
export async function discoverProjectAgentsSkills(directory?: string): Promise<LoadedSkill[]> {
|
|
const agentsProjectDir = join(directory ?? process.cwd(), ".agents", "skills")
|
|
return loadSkillsFromDir({ skillsDir: agentsProjectDir, scope: "project" })
|
|
}
|
|
|
|
export async function discoverGlobalAgentsSkills(): Promise<LoadedSkill[]> {
|
|
const agentsGlobalDir = join(homedir(), ".agents", "skills")
|
|
return loadSkillsFromDir({ skillsDir: agentsGlobalDir, scope: "user" })
|
|
}
|