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
98 lines
3.1 KiB
TypeScript
98 lines
3.1 KiB
TypeScript
import type { AvailableSkill } from "../agents/dynamic-agent-prompt-builder"
|
|
import type { OhMyOpenCodeConfig } from "../config"
|
|
import type { BrowserAutomationProvider } from "../config/schema/browser-automation"
|
|
import type {
|
|
LoadedSkill,
|
|
SkillScope,
|
|
} from "../features/opencode-skill-loader/types"
|
|
|
|
import {
|
|
discoverConfigSourceSkills,
|
|
discoverUserClaudeSkills,
|
|
discoverProjectClaudeSkills,
|
|
discoverOpencodeGlobalSkills,
|
|
discoverOpencodeProjectSkills,
|
|
discoverProjectAgentsSkills,
|
|
discoverGlobalAgentsSkills,
|
|
mergeSkills,
|
|
} from "../features/opencode-skill-loader"
|
|
import { createBuiltinSkills } from "../features/builtin-skills"
|
|
import { getSystemMcpServerNames } from "../features/claude-code-mcp-loader"
|
|
|
|
export type SkillContext = {
|
|
mergedSkills: LoadedSkill[]
|
|
availableSkills: AvailableSkill[]
|
|
browserProvider: BrowserAutomationProvider
|
|
disabledSkills: Set<string>
|
|
}
|
|
|
|
function mapScopeToLocation(scope: SkillScope): AvailableSkill["location"] {
|
|
if (scope === "user" || scope === "opencode") return "user"
|
|
if (scope === "project" || scope === "opencode-project") return "project"
|
|
return "plugin"
|
|
}
|
|
|
|
export async function createSkillContext(args: {
|
|
directory: string
|
|
pluginConfig: OhMyOpenCodeConfig
|
|
}): Promise<SkillContext> {
|
|
const { directory, pluginConfig } = args
|
|
|
|
const browserProvider: BrowserAutomationProvider =
|
|
pluginConfig.browser_automation_engine?.provider ?? "playwright"
|
|
|
|
const disabledSkills = new Set<string>(pluginConfig.disabled_skills ?? [])
|
|
const systemMcpNames = getSystemMcpServerNames()
|
|
|
|
const builtinSkills = createBuiltinSkills({
|
|
browserProvider,
|
|
disabledSkills,
|
|
}).filter((skill) => {
|
|
if (skill.mcpConfig) {
|
|
for (const mcpName of Object.keys(skill.mcpConfig)) {
|
|
if (systemMcpNames.has(mcpName)) return false
|
|
}
|
|
}
|
|
return true
|
|
})
|
|
|
|
const includeClaudeSkills = pluginConfig.claude_code?.skills !== false
|
|
const [configSourceSkills, userSkills, globalSkills, projectSkills, opencodeProjectSkills, agentsProjectSkills, agentsGlobalSkills] =
|
|
await Promise.all([
|
|
discoverConfigSourceSkills({
|
|
config: pluginConfig.skills,
|
|
configDir: directory,
|
|
}),
|
|
includeClaudeSkills ? discoverUserClaudeSkills() : Promise.resolve([]),
|
|
discoverOpencodeGlobalSkills(),
|
|
includeClaudeSkills ? discoverProjectClaudeSkills(directory) : Promise.resolve([]),
|
|
discoverOpencodeProjectSkills(directory),
|
|
discoverProjectAgentsSkills(directory),
|
|
discoverGlobalAgentsSkills(),
|
|
])
|
|
|
|
const mergedSkills = mergeSkills(
|
|
builtinSkills,
|
|
pluginConfig.skills,
|
|
configSourceSkills,
|
|
[...userSkills, ...agentsGlobalSkills],
|
|
globalSkills,
|
|
[...projectSkills, ...agentsProjectSkills],
|
|
opencodeProjectSkills,
|
|
{ configDir: directory },
|
|
)
|
|
|
|
const availableSkills: AvailableSkill[] = mergedSkills.map((skill) => ({
|
|
name: skill.name,
|
|
description: skill.definition.description ?? "",
|
|
location: mapScopeToLocation(skill.scope),
|
|
}))
|
|
|
|
return {
|
|
mergedSkills,
|
|
availableSkills,
|
|
browserProvider,
|
|
disabledSkills,
|
|
}
|
|
}
|