Merge pull request #4141 from code-yeongyu/fix/3396-config-skills-paths-discovery

fix: discover skills from host config.skills.paths set by other plugins
This commit is contained in:
YeonGyu-Kim
2026-05-18 13:50:34 +09:00
committed by GitHub
6 changed files with 203 additions and 0 deletions
@@ -36,6 +36,7 @@ import {
} from "./agent-override-protection";
import { buildPrometheusAgentConfig } from "./prometheus-agent-config-builder";
import { buildPlanDemoteConfig } from "./plan-model-inheritance";
import { adaptHostSkillConfig } from "../shared/host-skill-config";
type AgentConfigRecord = Record<string, Record<string, unknown> | undefined> & {
build?: Record<string, unknown>;
@@ -62,8 +63,10 @@ export async function applyAgentConfig(params: {
) as typeof params.pluginConfig.disabled_agents;
const includeClaudeSkillsForAwareness = params.pluginConfig.claude_code?.skills ?? true;
const hostSkillConfig = adaptHostSkillConfig(params.config.skills);
const [
discoveredConfigSourceSkills,
discoveredHostConfigSkills,
discoveredUserSkills,
discoveredProjectSkills,
discoveredProjectAgentsSkills,
@@ -75,6 +78,10 @@ export async function applyAgentConfig(params: {
config: params.pluginConfig.skills,
configDir: params.ctx.directory,
}),
discoverConfigSourceSkills({
config: hostSkillConfig,
configDir: params.ctx.directory,
}),
includeClaudeSkillsForAwareness ? discoverUserClaudeSkills() : Promise.resolve([]),
includeClaudeSkillsForAwareness
? discoverProjectClaudeSkills(params.ctx.directory)
@@ -89,6 +96,7 @@ export async function applyAgentConfig(params: {
const allDiscoveredSkills = [
...discoveredConfigSourceSkills,
...discoveredHostConfigSkills,
...discoveredOpencodeProjectSkills,
...discoveredProjectSkills,
...discoveredProjectAgentsSkills,