From 1cfb6e5d976ecd16c0a8a11300188dccea8af938 Mon Sep 17 00:00:00 2001 From: sms <114885497+seanmartinsmith@users.noreply.github.com> Date: Wed, 6 May 2026 08:18:36 -0400 Subject: [PATCH] fix(plugin): move claude agent out of shared codex dir to fix plugin install the claude plugin manifest declared agents at ./skills/beads/agents/, which also contains openai.yaml (codex interface metadata). claude code's plugin loader scans that dir and rejects non-md files, failing manifest validation with 'agents: Invalid input'. move task-agent.md back to plugins/beads/agents/ (the claude default, what v1.0.0 used) and drop the explicit agents key from .claude-plugin/plugin.json. codex's openai.yaml stays at skills/beads/agents/openai.yaml where bd setup codex writes it and where the embed in internal/templates/ lives. shared skill tree and dual claude/codex manifests are preserved per #3664. Fixes #3741 --- cmd/bd/setup/plugin_layout_test.go | 12 ++++++------ plugins/beads/.claude-plugin/plugin.json | 1 - .../beads/{skills/beads => }/agents/task-agent.md | 0 3 files changed, 6 insertions(+), 7 deletions(-) rename plugins/beads/{skills/beads => }/agents/task-agent.md (100%) diff --git a/cmd/bd/setup/plugin_layout_test.go b/cmd/bd/setup/plugin_layout_test.go index 005780b91..7f97338e8 100644 --- a/cmd/bd/setup/plugin_layout_test.go +++ b/cmd/bd/setup/plugin_layout_test.go @@ -24,9 +24,9 @@ func TestPluginLayoutUsesSharedBeadsRoot(t *testing.T) { } var claudeManifest struct { - Skills string `json:"skills"` - Commands string `json:"commands"` - Agents string `json:"agents"` + Skills string `json:"skills"` + Commands string `json:"commands"` + Agents *string `json:"agents"` } readJSONFile(t, filepath.Join(root, "plugins", "beads", ".claude-plugin", "plugin.json"), &claudeManifest) if claudeManifest.Skills != "./skills/" { @@ -35,8 +35,8 @@ func TestPluginLayoutUsesSharedBeadsRoot(t *testing.T) { if claudeManifest.Commands != "./skills/beads/commands/" { t.Fatalf("Claude commands path = %q, want ./skills/beads/commands/", claudeManifest.Commands) } - if claudeManifest.Agents != "./skills/beads/agents/" { - t.Fatalf("Claude agents path = %q, want ./skills/beads/agents/", claudeManifest.Agents) + if claudeManifest.Agents != nil { + t.Fatalf("Claude agents path = %q, want unset (default ./agents/) so the loader does not scan codex yaml as agents", *claudeManifest.Agents) } var codexManifest struct { @@ -49,7 +49,7 @@ func TestPluginLayoutUsesSharedBeadsRoot(t *testing.T) { requireRepoFile(t, root, "plugins", "beads", "skills", "beads", "SKILL.md") requireRepoFile(t, root, "plugins", "beads", "skills", "beads", "agents", "openai.yaml") - requireRepoFile(t, root, "plugins", "beads", "skills", "beads", "agents", "task-agent.md") + requireRepoFile(t, root, "plugins", "beads", "agents", "task-agent.md") requireRepoFile(t, root, "plugins", "beads", "skills", "beads", "commands", "ready.md") } diff --git a/plugins/beads/.claude-plugin/plugin.json b/plugins/beads/.claude-plugin/plugin.json index 16f559ebe..ce3275c12 100644 --- a/plugins/beads/.claude-plugin/plugin.json +++ b/plugins/beads/.claude-plugin/plugin.json @@ -17,7 +17,6 @@ ], "skills": "./skills/", "commands": "./skills/beads/commands/", - "agents": "./skills/beads/agents/", "hooks": { "SessionStart": [ { diff --git a/plugins/beads/skills/beads/agents/task-agent.md b/plugins/beads/agents/task-agent.md similarity index 100% rename from plugins/beads/skills/beads/agents/task-agent.md rename to plugins/beads/agents/task-agent.md