Skip to content

fix(skill): don't register payload files beside a bundle's SKILL.md #3741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
he-yufeng wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −15
Open

fix(skill): don't register payload files beside a bundle's SKILL.md #3741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions packages/agent-core-v2/src/features/skill/catalog/fileSkillDiscovery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,11 @@ export async function discoverFileSkills(
}

if (isTopLevel) {
let rootIsBundle = false;
if (root.plugin !== undefined) {
const rootSkillMd = path.join(dirPath, 'SKILL.md');
if (await isFile(rootSkillMd)) {
rootIsBundle = true;
await parseAndRegister({
byDiscoveryKey,
skipped,
Expand All @@ -108,21 +110,23 @@ export async function discoverFileSkills(
}
}

for (const entry of entries) {
if (!entry.endsWith('.md')) continue;
if (entry === 'SKILL.md') continue;
const skillName = entry.slice(0, -'.md'.length);
if (directorySkills.has(skillName)) continue;
const skillMdPath = path.join(dirPath, entry);
if (!(await isFile(skillMdPath))) continue;
await parseAndRegister({
byDiscoveryKey,
skipped,
warn,
skillMdPath,
skillDirName: skillName,
root,
});
if (!rootIsBundle) {

@chatgpt-codex-connector chatgpt-codex-connector Bot Sep 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Apply the bundle guard to runtime skill discovery

Workspace/session catalogs are built with RuntimeSkillDiscovery in program.ts, not this FileSkillDiscovery, and its top-level loop at runtimeSkillDiscovery.ts:142-158 still registers every sibling .md file after loading the root SKILL.md. Consequently, the reported plugin layout continues to expose GLOSSARY-FORMAT as a phantom skill during normal session use; mirror this guard in the runtime scanner (and cover that production path) as well.

Useful? React with 👍 / 👎.

for (const entry of entries) {
if (!entry.endsWith('.md')) continue;
if (entry === 'SKILL.md') continue;
const skillName = entry.slice(0, -'.md'.length);
if (directorySkills.has(skillName)) continue;
const skillMdPath = path.join(dirPath, entry);
if (!(await isFile(skillMdPath))) continue;
await parseAndRegister({
byDiscoveryKey,
skipped,
warn,
skillMdPath,
skillDirName: skillName,
root,
});
}
}
}

Expand Down
9 changes: 9 additions & 0 deletions packages/agent-core-v2/test/features/skill/catalog/fileSkillDiscovery.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,15 @@ describe('FileSkillDiscovery', () => {
expect(result.skills.map((s) => s.name)).toEqual(['summarize']);
});

it('does not register payload files beside a bundle SKILL.md at a plugin root', async () => {
await writeSkill('teach/SKILL.md', 'name: teach\ndescription: the teach bundle');
await writeFile(join(root, 'teach', 'GLOSSARY-FORMAT.md'), '# payload\n');

const result = await discover([pluginSkillRoot('teach', 'mattpocock-skills')]);

expect(result.skills.map((s) => s.name)).toEqual(['teach']);
});

it('discovers only the root SKILL.md for a root-skill-only plugin root', async () => {
await writeSkill('plugin/SKILL.md', 'name: root-skill\ndescription: at plugin root');
await writeFile(join(root, 'plugin', 'CHANGELOG.md'), '# Changelog\n');
Expand Down
Loading